Merge branch 'linux-3.10.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable...

[firefly-linux-kernel-4.4.55.git] / fs / proc / root.c

diff --git a/fs/proc/root.c b/fs/proc/root.c
index 04ec276c7bab9dfcfd65a4bc5e61bb15ac413a2f..9459710c55aee0a287014eab85ab373cef3576f8 100644 (file)
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -180,9 +180,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();
 }