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-x86 | |
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-x86')
-rw-r--r-- | include/asm-x86/ide.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h index 800edccd33f1..cf9c98e5bdb5 100644 --- a/include/asm-x86/ide.h +++ b/include/asm-x86/ide.h | |||
@@ -58,12 +58,6 @@ static __inline__ unsigned long ide_default_io_base(int index) | |||
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | #ifdef CONFIG_BLK_DEV_IDEPCI | ||
62 | #define ide_init_default_irq(base) (0) | ||
63 | #else | ||
64 | #define ide_init_default_irq(base) ide_default_irq(base) | ||
65 | #endif | ||
66 | |||
67 | #include <asm-generic/ide_iops.h> | 61 | #include <asm-generic/ide_iops.h> |
68 | 62 | ||
69 | #endif /* __KERNEL__ */ | 63 | #endif /* __KERNEL__ */ |