diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2003-03-20 06:03:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-03-20 06:03:49 -0800 |
| commit | d3e2e000f07607c9e6571139c95d564d55cf05be (patch) | |
| tree | 92e0a2486919a900654f208e95d2335afa3536a1 /include/linux | |
| parent | 06792e92123a2731079d64af53846152e883261a (diff) | |
[PATCH] IDE_ARCH_ACK_INTR duplicate
ide_ack_intr is defined in asm-*/ide.h, if IDE_ARCH_ACK_INTR is set.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 5 |
1 files changed, 1 insertions, 4 deletions
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 |