patch-2.1.101 linux/include/asm-arm/arch-arc/ide.h

Next file: linux/include/asm-arm/arch-arc/irqs.h
Previous file: linux/include/asm-arm/arch-a5k/uncompress.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.100/linux/include/asm-arm/arch-arc/ide.h linux/include/asm-arm/arch-arc/ide.h
@@ -11,13 +11,14 @@
  */
 
 #include <linux/config.h>
+#include <asm/irq.h>
 
 static __inline__ int
 ide_default_irq(ide_ioreg_t base)
 {
 #ifdef CONFIG_ARCH_A5K
 	if (base == 0x1f0)
-		return 11;
+		return IRQ_HARDDISK;
 #endif
 	return 0;
 }
@@ -52,5 +53,5 @@
 	}
 	*p++ = ctrl;
 	if (irq != NULL)
-		irq = 0;
+		*irq = 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov