diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-06 23:00:13 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-06 23:00:13 +0000 |
| commit | 37ef3109f366ac0adbd2edf541b8fb8c6bd5af25 (patch) | |
| tree | c2eb5b2ca5098d984f4f907ea4f31ed43892d388 /arch/mips/kernel/setup.c | |
| parent | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (diff) | |
Initrd fixes from Steven.
Diffstat (limited to 'arch/mips/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index bffbd67cf..587adaadd 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -26,13 +26,9 @@ #include <linux/a.out.h> #include <linux/tty.h> #include <linux/bootmem.h> -#ifdef CONFIG_BLK_DEV_RAM #include <linux/blk.h> -#endif #include <linux/ide.h> -#ifdef CONFIG_RTC #include <linux/timex.h> -#endif #include <asm/asm.h> #include <asm/bootinfo.h> @@ -69,16 +65,16 @@ int EISA_bus = 0; struct screen_info screen_info; -#ifdef CONFIG_BLK_DEV_FD extern struct fd_ops no_fd_ops; struct fd_ops *fd_ops; -#endif #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) extern struct ide_ops no_ide_ops; struct ide_ops *ide_ops; #endif +extern void * __rd_start, * __rd_end; + extern struct rtc_ops no_rtc_ops; struct rtc_ops *rtc_ops; @@ -504,9 +500,6 @@ void __init setup_arch(char **cmdline_p) void momenco_ocelot_setup(void); void nino_setup(void); -#ifdef CONFIG_NINO - extern void * __rd_start, * __rd_end; -#endif unsigned long bootmap_size; unsigned long start_pfn, max_pfn, first_usable_pfn; @@ -697,15 +690,12 @@ void __init setup_arch(char **cmdline_p) /* Reserve the bootmap memory. */ reserve_bootmem(PFN_PHYS(first_usable_pfn), bootmap_size); -#ifdef CONFIG_NINO +#ifdef CONFIG_BLK_DEV_INITRD + /* Board specific code should have set up initrd_start and initrd_end */ ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); initrd_start = (unsigned long)&__rd_start; initrd_end = (unsigned long)&__rd_end; initrd_below_start_ok = 1; -#endif - -#ifdef CONFIG_BLK_DEV_INITRD - /* Board specific code should have set up initrd_start and initrd_end */ if (initrd_start) { unsigned long initrd_size = ((unsigned char *)initrd_end) - ((unsigned char *)initrd_start); printk("Initial ramdisk at: 0x%p (%lu bytes)\n", |