patch-2.4.22 linux-2.4.22/arch/mips/vr41xx/nec-eagle/setup.c
Next file: linux-2.4.22/arch/mips/vr41xx/nec-eagle/vrc4173.c
Previous file: linux-2.4.22/arch/mips/vr41xx/nec-eagle/pci_fixup.c
Back to the patch index
Back to the overall index
- Lines: 45
- Date:
2003-08-25 04:44:40.000000000 -0700
- Orig file:
linux-2.4.21/arch/mips/vr41xx/nec-eagle/setup.c
- Orig date:
2002-11-28 15:53:10.000000000 -0800
diff -urN linux-2.4.21/arch/mips/vr41xx/nec-eagle/setup.c linux-2.4.22/arch/mips/vr41xx/nec-eagle/setup.c
@@ -55,13 +55,12 @@
extern void * __rd_start, * __rd_end;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
-extern struct ide_ops eagle_ide_ops;
-#endif
-
extern void eagle_irq_init(void);
#ifdef CONFIG_PCI
+
+extern void vrc4173_preinit(void);
+
static struct resource vr41xx_pci_io_resource = {
"PCI I/O space",
VR41XX_PCI_IO_START,
@@ -135,22 +134,22 @@
conswitchp = &dummy_con;
#endif
-#ifdef CONFIG_BLK_DEV_IDE
- ide_ops = &eagle_ide_ops;
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
+ ide_ops = &vr41xx_ide_ops;
#endif
vr41xx_bcu_init();
vr41xx_cmu_init(0);
+#ifdef CONFIG_SERIAL
vr41xx_dsiu_init();
vr41xx_siu_init(SIU_RS232C, 0);
+#endif
#ifdef CONFIG_PCI
vr41xx_pciu_init(&pci_address_map);
-#endif
-#ifdef CONFIG_VRC4173
- vrc4173_init();
+ vrc4173_preinit();
#endif
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)