diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /init | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index fb7653141..a0d15926e 100644 --- a/init/main.c +++ b/init/main.c @@ -32,6 +32,7 @@ #include <linux/slab.h> #include <linux/major.h> #include <linux/blk.h> +#include <linux/nametrans.h> #include <linux/init.h> #ifdef CONFIG_ROOT_NFS #include <linux/nfs_fs.h> @@ -75,6 +76,7 @@ extern unsigned long pci_init(unsigned long, unsigned long); extern long mca_init(long, long); extern long sbus_init(long, long); extern void sysctl_init(void); +extern void filescache_init(void); extern void smp_setup(char *str, int *ints); extern void no_scroll(char *str, int *ints); @@ -87,6 +89,9 @@ extern void msmouse_setup(char *str, int *ints); extern void lp_setup(char *str, int *ints); #endif extern void eth_setup(char *str, int *ints); +#ifdef CONFIG_DECNET +extern void decnet_setup(char *str, int *ints); +#endif extern void xd_setup(char *str, int *ints); #ifdef CONFIG_BLK_DEV_EZ extern void ez_setup(char *str, int *ints); @@ -335,6 +340,9 @@ struct { #ifdef CONFIG_INET { "ether=", eth_setup }, #endif +#ifdef CONFIG_DECNET + { "decnet=", decnet_setup }, +#endif #ifdef CONFIG_PRINTER { "lp=", lp_setup }, #endif @@ -562,6 +570,12 @@ __initfunc(static int checksetup(char *line)) return 1; } #endif +#ifdef CONFIG_TRANS_NAMES + if(!strncmp(line,"nametrans=",10)) { + nametrans_setup(line+10); + return 1; + } +#endif while (bootsetups[i].str) { int n = strlen(bootsetups[i].str); if (!strncmp(line,bootsetups[i].str,n)) { @@ -901,6 +915,7 @@ __initfunc(asmlinkage void start_kernel(void)) proc_root_init(); #endif uidcache_init(); + filescache_init(); vma_init(); buffer_init(); inode_init(); |