diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
| commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
| tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /fs/proc/root.c | |
| parent | c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff) | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs/proc/root.c')
| -rw-r--r-- | fs/proc/root.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index aef148f099a2..68896283c8ae 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c | |||
| @@ -18,6 +18,8 @@ | |||
| 18 | #include <linux/bitops.h> | 18 | #include <linux/bitops.h> |
| 19 | #include <linux/smp_lock.h> | 19 | #include <linux/smp_lock.h> |
| 20 | 20 | ||
| 21 | #include "internal.h" | ||
| 22 | |||
| 21 | struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver; | 23 | struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver; |
| 22 | 24 | ||
| 23 | #ifdef CONFIG_SYSCTL | 25 | #ifdef CONFIG_SYSCTL |
| @@ -36,7 +38,6 @@ static struct file_system_type proc_fs_type = { | |||
| 36 | .kill_sb = kill_anon_super, | 38 | .kill_sb = kill_anon_super, |
| 37 | }; | 39 | }; |
| 38 | 40 | ||
| 39 | extern int __init proc_init_inodecache(void); | ||
| 40 | void __init proc_root_init(void) | 41 | void __init proc_root_init(void) |
| 41 | { | 42 | { |
| 42 | int err = proc_init_inodecache(); | 43 | int err = proc_init_inodecache(); |
