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 /drivers/ide/ide-generic.c | |
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 'drivers/ide/ide-generic.c')
-rw-r--r-- | drivers/ide/ide-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 4f996d01587a..25fda0a3263f 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c | |||
@@ -97,7 +97,7 @@ static int __init ide_generic_init(void) | |||
97 | if (hwif->chipset == ide_unknown && io_addr) { | 97 | if (hwif->chipset == ide_unknown && io_addr) { |
98 | memset(&hw, 0, sizeof(hw)); | 98 | memset(&hw, 0, sizeof(hw)); |
99 | ide_std_init_ports(&hw, io_addr, io_addr + 0x206); | 99 | ide_std_init_ports(&hw, io_addr, io_addr + 0x206); |
100 | hw.irq = ide_init_default_irq(io_addr); | 100 | hw.irq = ide_default_irq(io_addr); |
101 | ide_init_port_hw(hwif, &hw); | 101 | ide_init_port_hw(hwif, &hw); |
102 | 102 | ||
103 | idx[i] = i; | 103 | idx[i] = i; |