diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-21 00:13:43 +0900 |
| commit | 21d7f14b70fed254222a24e124e8771e1437be4c (patch) | |
| tree | 3c52e48b28d5675bafa005e061b5639966671ca3 /fs/proc/root.c | |
| parent | eff6a902ff6b8a42f768c4b78fc63b9b8d0a41d9 (diff) | |
| parent | 2ea8f7ea87f24735c49543c7f523919295028c58 (diff) | |
Merge branch 'lsk/v3.14/topic/of' into linux-linaro-lsk-v3.14lsk-v3.14-15.02lsk-v3.14-14.02
Conflicts:
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/address.c
drivers/of/selftest.c
include/linux/of.h
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 87dbcbef7fe4..7bbeb5257af1 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -183,9 +183,6 @@ void __init proc_root_init(void) proc_mkdir("openprom", NULL); #endif proc_tty_init(); -#ifdef CONFIG_PROC_DEVICETREE - proc_device_tree_init(); -#endif proc_mkdir("bus", NULL); proc_sys_init(); } |