diff options
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 4b00945cf7d1..f3a56595eb75 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -837,20 +837,13 @@ static int ide_port_setup_devices(ide_hwif_t *hwif) | |||
837 | static int init_irq (ide_hwif_t *hwif) | 837 | static int init_irq (ide_hwif_t *hwif) |
838 | { | 838 | { |
839 | struct ide_io_ports *io_ports = &hwif->io_ports; | 839 | struct ide_io_ports *io_ports = &hwif->io_ports; |
840 | irq_handler_t irq_handler; | 840 | struct ide_host *host = hwif->host; |
841 | int sa = 0; | 841 | irq_handler_t irq_handler = host->irq_handler; |
842 | int sa = host->irq_flags; | ||
842 | 843 | ||
843 | irq_handler = hwif->host->irq_handler; | ||
844 | if (irq_handler == NULL) | 844 | if (irq_handler == NULL) |
845 | irq_handler = ide_intr; | 845 | irq_handler = ide_intr; |
846 | 846 | ||
847 | #if defined(__mc68000__) | ||
848 | sa = IRQF_SHARED; | ||
849 | #endif /* __mc68000__ */ | ||
850 | |||
851 | if (hwif->chipset == ide_pci) | ||
852 | sa = IRQF_SHARED; | ||
853 | |||
854 | if (io_ports->ctl_addr) | 847 | if (io_ports->ctl_addr) |
855 | hwif->tp_ops->set_irq(hwif, 1); | 848 | hwif->tp_ops->set_irq(hwif, 1); |
856 | 849 | ||