patch-2.3.13 linux/include/asm-ppc/ide.h

Next file: linux/include/asm-ppc/system.h
Previous file: linux/include/asm-mips/system.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.12/linux/include/asm-ppc/ide.h linux/include/asm-ppc/ide.h
@@ -21,6 +21,7 @@
 
 #ifdef __KERNEL__
 
+#include <linux/config.h>
 #include <linux/hdreg.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
@@ -105,7 +106,7 @@
 
 static __inline__ void ide_init_default_hwifs(void)
 {
-#ifdef __DO_I_NEED_THIS
+#ifndef CONFIG_BLK_DEV_IDEPCI
 	hw_regs_t hw;
 	int index;
 
@@ -114,7 +115,7 @@
 		hw.irq = ide_default_irq(ide_default_io_base(index));
 		ide_register_hw(&hw, NULL);
 	}
-#endif /* __DO_I_NEED_THIS */
+#endif /* CONFIG_BLK_DEV_IDEPCI */
 }
 
 static __inline__ int ide_check_region (ide_ioreg_t from, unsigned int extent)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)