[PATCH] IDE_ARCH_ACK_INTR duplicate

[Geert Uytterhoeven]

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

--- linux-2.5.x/include/linux/ide.h	Tue Feb 25 10:21:55 2003
+++ linux-m68k-2.5.x/include/linux/ide.h	Wed Feb 26 12:09:13 2003
@@ -341,10 +341,7 @@
 #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
 

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [e-mail]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds