[PATCH] IDE_ARCH_ACK_INTR duplicate

ide_ack_intr is defined in asm-*/ide.h, if IDE_ARCH_ACK_INTR is set.

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7510ad7d1aa4200afc0b1004f2f4f5e25f59bcc1..fb6473237d5299ea2feba60269d1c5537f4bd2ff 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -341,10 +341,7 @@ void ide_setup_ports(      hw_regs_t *hw,
 #include <asm/ide.h>
 
 /* Currently only m68k, apus and m8xx need it */
-#ifdef IDE_ARCH_ACK_INTR
-extern int ide_irq_lock;
-# define ide_ack_intr(hwif) (hwif->hw.ack_intr ? hwif->hw.ack_intr(hwif) : 1)
-#else
+#ifndef IDE_ARCH_ACK_INTR
 # define ide_ack_intr(hwif) (1)
 #endif