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

• Lines: 17
• Date: Wed Sep 30 10:14:33 1998
• Orig file: v2.1.123/linux/include/asm-ppc/ide.h
• Orig date: Thu Aug 27 19:56:30 1998

diff -u --recursive --new-file v2.1.123/linux/include/asm-ppc/ide.h linux/include/asm-ppc/ide.h
@@ -14,11 +14,15 @@
 #include <linux/config.h>
 #ifdef CONFIG_APUS
 #include <linux/hdreg.h>
+
+#define ide_init_hwif_ports m68k_ide_init_hwif_ports 
 #include <asm-m68k/ide.h>
+#undef ide_init_hwif_ports
+#undef insw
+
 void ide_init_hwif_ports(ide_ioreg_t *p, ide_ioreg_t base, int *irq);
 void ide_insw(ide_ioreg_t port, void *buf, int ns);
 void ide_outsw(ide_ioreg_t port, void *buf, int ns);
-#undef insw
 #define insw(port, buf, ns) 	do {			\
 	if ( _machine != _MACH_Pmac && _machine != _MACH_apus )	\
 		/* this must be the same as insw in io.h!! */	\