Commit d3e2e000 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] IDE_ARCH_ACK_INTR duplicate

ide_ack_intr is defined in asm-*/ide.h, if IDE_ARCH_ACK_INTR is set.
parent 06792e92
...@@ -341,10 +341,7 @@ void ide_setup_ports( hw_regs_t *hw, ...@@ -341,10 +341,7 @@ void ide_setup_ports( hw_regs_t *hw,
#include <asm/ide.h> #include <asm/ide.h>
/* Currently only m68k, apus and m8xx need it */ /* Currently only m68k, apus and m8xx need it */
#ifdef IDE_ARCH_ACK_INTR #ifndef 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
# define ide_ack_intr(hwif) (1) # define ide_ack_intr(hwif) (1)
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment