diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
tree | 89354903b01fa0a447bffeefe00df3044495db2e /fs/proc/root.c | |
parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'fs/proc/root.c')
-rw-r--r-- | fs/proc/root.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 82b3fd71d..f6a775359 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -155,7 +155,7 @@ struct proc_dir_entry proc_root = { &proc_root, NULL }; -struct proc_dir_entry *proc_net, *proc_scsi, *proc_bus; +struct proc_dir_entry *proc_net, *proc_scsi, *proc_bus, *proc_sysvipc; #ifdef CONFIG_MCA struct proc_dir_entry proc_mca = { @@ -688,6 +688,9 @@ __initfunc(void proc_root_init(void)) proc_register(&proc_root, &proc_root_self); proc_net = create_proc_entry("net", S_IFDIR, 0); proc_scsi = create_proc_entry("scsi", S_IFDIR, 0); +#ifdef CONFIG_SYSVIPC + proc_sysvipc = create_proc_entry("sysvipc", S_IFDIR, 0); +#endif #ifdef CONFIG_SYSCTL proc_register(&proc_root, &proc_sys_root); #endif |