diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-28 22:00:09 +0000 |
| commit | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch) | |
| tree | 141e31f89f18b9fe0831f31852e0435ceaccafc5 /init | |
| parent | fb9c690a18b3d66925a65b17441c37fa14d4370b (diff) | |
Merge with 2.4.0-test7.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c index 8c5bb2aca..c4422fe0d 100644 --- a/init/main.c +++ b/init/main.c @@ -96,7 +96,6 @@ extern void sysctl_init(void); extern void signals_init(void); extern void bdev_init(void); extern int init_pcmcia_ds(void); -extern int usb_init(void); extern void free_initmem(void); extern void filesystem_setup(void); @@ -566,8 +565,8 @@ asmlinkage void __init start_kernel(void) mempages = num_physpages; fork_init(mempages); + proc_caches_init(); vfs_caches_init(mempages); - vma_init(); buffer_init(mempages); page_cache_init(mempages); kiobuf_setup(); @@ -690,10 +689,6 @@ static void __init do_basic_setup(void) #ifdef CONFIG_ISAPNP isapnp_init(); #endif -#ifdef CONFIG_USB - usb_init(); /* Do this before doing initcalls, so that we can make - usbcore initialize here, and all drivers initialize later */ -#endif #ifdef CONFIG_TC tc_init(); #endif |