diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:04:04 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-03-20 21:04:04 +0100 |
| commit | 82fc0deb5fb5067c5207ace309b4e3af3eeec17b (patch) | |
| tree | b74cc762f65e4e8957098767b07e423f62cc38a4 /fs/proc/root.c | |
| parent | e20e8b472345ea5babd805db6726d1a7000f7673 (diff) | |
| parent | 5210951a4876a42856434546d2789838d3e35f34 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-15.03-rt
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(); } |