From d3e2e000f07607c9e6571139c95d564d55cf05be Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 20 Mar 2003 06:03:49 -0800
Subject: [PATCH] IDE_ARCH_ACK_INTR duplicate

ide_ack_intr is defined in asm-*/ide.h, if IDE_ARCH_ACK_INTR is set.
---
 include/linux/ide.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'include/linux')

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7510ad7d1aa4..fb6473237d52 100644
--- 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
 
-- 
cgit v1.2.3