diff options
| author | Andy Grover <agrover@groveronline.com> | 2003-03-20 18:45:08 -0800 |
|---|---|---|
| committer | Andy Grover <agrover@groveronline.com> | 2003-03-20 18:45:08 -0800 |
| commit | ff6e14381a7c1597c4ffbeb760e9802f3ebaebb2 (patch) | |
| tree | f5463b22c7b9b67342cde9e46f1d3a3068019ec8 /include/linux/ide.h | |
| parent | ecabd7d2dd8117b1ec4cc4b7303a7e8198843684 (diff) | |
| parent | aa43a933c82fe96479cd5e260a221b69409a553b (diff) | |
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
Diffstat (limited to 'include/linux/ide.h')
| -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 |