diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /init/main.c | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c index 6fa12be70..f11652338 100644 --- a/init/main.c +++ b/init/main.c @@ -647,16 +647,15 @@ static void __init do_basic_setup(void) /* Networking initialization needs a process context */ sock_init(); - do_initcalls(); - #ifdef CONFIG_BLK_DEV_INITRD - real_root_dev = ROOT_DEV; real_root_mountflags = root_mountflags; if (initrd_start && mount_initrd) root_mountflags &= ~MS_RDONLY; else mount_initrd =0; #endif + do_initcalls(); + /* .. filesystems .. */ filesystem_setup(); |