aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/atiixp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci/atiixp.c')
-rw-r--r--drivers/ide/pci/atiixp.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 18c181bc841b..47e95806c07f 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -172,9 +172,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
172 u8 ch = hwif->channel; 172 u8 ch = hwif->channel;
173 struct pci_dev *pdev = hwif->pci_dev; 173 struct pci_dev *pdev = hwif->pci_dev;
174 174
175 if (!hwif->irq)
176 hwif->irq = ch ? 15 : 14;
177
178 hwif->set_pio_mode = &atiixp_set_pio_mode; 175 hwif->set_pio_mode = &atiixp_set_pio_mode;
179 hwif->set_dma_mode = &atiixp_set_dma_mode; 176 hwif->set_dma_mode = &atiixp_set_dma_mode;
180 hwif->drives[0].autotune = 1; 177 hwif->drives[0].autotune = 1;
@@ -200,7 +197,7 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
200 .name = "ATIIXP", 197 .name = "ATIIXP",
201 .init_hwif = init_hwif_atiixp, 198 .init_hwif = init_hwif_atiixp,
202 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, 199 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
203 .host_flags = IDE_HFLAG_BOOTABLE, 200 .host_flags = IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,
204 .pio_mask = ATA_PIO4, 201 .pio_mask = ATA_PIO4,
205 .mwdma_mask = ATA_MWDMA2, 202 .mwdma_mask = ATA_MWDMA2,
206 .udma_mask = ATA_UDMA5, 203 .udma_mask = ATA_UDMA5,
@@ -208,7 +205,8 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
208 .name = "SB600_PATA", 205 .name = "SB600_PATA",
209 .init_hwif = init_hwif_atiixp, 206 .init_hwif = init_hwif_atiixp,
210 .enablebits = {{0x48,0x01,0x00}, {0x00,0x00,0x00}}, 207 .enablebits = {{0x48,0x01,0x00}, {0x00,0x00,0x00}},
211 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE, 208 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS |
209 IDE_HFLAG_BOOTABLE,
212 .pio_mask = ATA_PIO4, 210 .pio_mask = ATA_PIO4,
213 .mwdma_mask = ATA_MWDMA2, 211 .mwdma_mask = ATA_MWDMA2,
214 .udma_mask = ATA_UDMA5, 212 .udma_mask = ATA_UDMA5,