diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /init | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 1505510e7..6d8d413f4 100644 --- a/init/main.c +++ b/init/main.c @@ -96,6 +96,7 @@ extern void sysctl_init(void); extern void signals_init(void); extern void bdev_init(void); extern int init_pcmcia_ds(void); +extern void net_notifier_init(void); extern void free_initmem(void); extern void filesystem_setup(void); @@ -714,6 +715,15 @@ static void __init do_basic_setup(void) #ifdef CONFIG_PCMCIA init_pcmcia_ds(); /* Do this last */ #endif + +#ifdef CONFIG_HOTPLUG + /* do this after other 'do this last' stuff, because we want + * to minimize spurious executions of /sbin/hotplug + * during boot-up + */ + net_notifier_init(); +#endif + /* Mount the root filesystem.. */ mount_root(); |