diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
| commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
| tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /init/main.c | |
| parent | 2f42b5d043ee271d1e5d30ecd77186b6c4d4e534 (diff) | |
| parent | f8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff) | |
| download | linux-c7c350e92aab1bba68f26a6027b734adcf9824ba.tar.bz2 | |
Merge branch 'hotfixes' into devel
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/init/main.c b/init/main.c index fbb0167c6b8a..99ce94930b09 100644 --- a/init/main.c +++ b/init/main.c @@ -102,12 +102,6 @@ static inline void mark_rodata_ro(void) { } extern void tc_init(void); #endif -#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD -extern int populate_rootfs(void); -#else -static inline void populate_rootfs(void) {} -#endif - enum system_states system_state; EXPORT_SYMBOL(system_state); @@ -650,7 +644,6 @@ asmlinkage void __init start_kernel(void) check_bugs(); - populate_rootfs(); /* For DSDT override from initramfs */ acpi_early_init(); /* before LAPIC and SMP init */ /* Do the rest non-__init'ed, we're now alive */ |