patch-2.3.4 linux/arch/ppc/kernel/pmac_setup.c

• Lines: 30
• Date: Sat May 22 13:03:00 1999
• Orig file: v2.3.3/linux/arch/ppc/kernel/pmac_setup.c
• Orig date: Fri May 14 18:55:12 1999

diff -u --recursive --new-file v2.3.3/linux/arch/ppc/kernel/pmac_setup.c linux/arch/ppc/kernel/pmac_setup.c
@@ -41,6 +41,7 @@
 #include <linux/blk.h>
 #include <linux/vt_kern.h>
 #include <linux/console.h>
+#include <linux/ide.h>
 #include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -543,17 +544,18 @@
         ppc_generic_ide_fix_driveid(id);
 }
 
+#if defined(CONFIG_BLK_DEV_IDE_PMAC)
 /* This is declared in drivers/block/ide-pmac.c */
 void pmac_ide_init_hwif_ports (hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq);
-
+#else
 /*
  * This registers the standard ports for this architecture with the IDE
  * driver.
  */
-void
-ide_init_default_hwifs(void)
+void pmac_ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, ide_ioreg_t ctrl_port, int *irq)
 {
 }
+#endif
 #endif
 
 __initfunc(void