diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
commit | 273b8385e5817a4765f82257004c5ec661a6a5b2 (patch) | |
tree | 76ae63e30433fe2676c145421a1963a71f834ef0 /include/asm-powerpc/ide.h | |
parent | 486c92e2900d618c650a7099536310651aa6cf1b (diff) |
ide: remove ide_init_default_irq() macro
* Use ide_default_irq() instead of ide_init_default_irq() in
ide_generic host driver (so the correct IRQ is always set
regardless of CONFIG_PCI / CONFIG_BLK_DEV_IDEPCI).
* Remove no longer needed ide_init_default_irq() macro.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/asm-powerpc/ide.h')
-rw-r--r-- | include/asm-powerpc/ide.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h index 17c51efff67c..3d90bf7d3d73 100644 --- a/include/asm-powerpc/ide.h +++ b/include/asm-powerpc/ide.h | |||
@@ -73,12 +73,6 @@ static __inline__ unsigned long ide_default_io_base(int index) | |||
73 | return 0; | 73 | return 0; |
74 | } | 74 | } |
75 | 75 | ||
76 | #ifdef CONFIG_PCI | ||
77 | #define ide_init_default_irq(base) (0) | ||
78 | #else | ||
79 | #define ide_init_default_irq(base) ide_default_irq(base) | ||
80 | #endif | ||
81 | |||
82 | #ifdef CONFIG_BLK_DEV_MPC8xx_IDE | 76 | #ifdef CONFIG_BLK_DEV_MPC8xx_IDE |
83 | #define IDE_ARCH_ACK_INTR 1 | 77 | #define IDE_ARCH_ACK_INTR 1 |
84 | #define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1) | 78 | #define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1) |