X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-m68k%2Fide.h;h=909c6dfd3851169dae42ac87613a70fc912ece34;hb=acf63867ae06ef95eea7bf445ded2f05528a81b1;hp=365f76fb8013fbfa1c1ae0e531abe6d45ea93d51;hpb=d9eaec9e295a84a80b663996d0489fcff3a1dca9;p=linux-2.6

diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h
index 365f76fb80..909c6dfd38 100644
--- a/include/asm-m68k/ide.h
+++ b/include/asm-m68k/ide.h
@@ -123,7 +123,7 @@ static __inline__ void ide_release_lock (void)
 }
 
 static __inline__ void
-ide_get_lock(irqreturn_t (*handler)(int, void *, struct pt_regs *), void *data)
+ide_get_lock(irq_handler_t handler, void *data)
 {
 	if (MACH_IS_ATARI) {
 		if (falconide_intr_lock == 0) {
@@ -137,7 +137,7 @@ ide_get_lock(irqreturn_t (*handler)(int, void *, struct pt_regs *), void *data)
 #endif /* CONFIG_BLK_DEV_FALCON_IDE */
 
 #define IDE_ARCH_ACK_INTR
-#define ide_ack_intr(hwif)	((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1)
+#define ide_ack_intr(hwif)	((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)
 
 #endif /* __KERNEL__ */
 #endif /* _M68K_IDE_H */