projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[linux-2.6-block.git]
/
fs
/
proc
/
root.c
diff --git
a/fs/proc/root.c
b/fs/proc/root.c
index ac823a85cf6e5675b6ff3318784c6c8f9ea176ef..5dbadecb234da01be9cc7eb5705e71363da7dfea 100644
(file)
--- a/
fs/proc/root.c
+++ b/
fs/proc/root.c
@@
-185,9
+185,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();
}