diff options
Diffstat (limited to 'drivers/ide/piix.c')
-rw-r--r-- | drivers/ide/piix.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c index f1e2e4ef0d71..42c2e3522d74 100644 --- a/drivers/ide/piix.c +++ b/drivers/ide/piix.c | |||
@@ -318,19 +318,12 @@ static const struct ide_port_ops ich_port_ops = { | |||
318 | .cable_detect = piix_cable_detect, | 318 | .cable_detect = piix_cable_detect, |
319 | }; | 319 | }; |
320 | 320 | ||
321 | #ifndef CONFIG_IA64 | ||
322 | #define IDE_HFLAGS_PIIX IDE_HFLAG_LEGACY_IRQS | ||
323 | #else | ||
324 | #define IDE_HFLAGS_PIIX 0 | ||
325 | #endif | ||
326 | |||
327 | #define DECLARE_PIIX_DEV(udma) \ | 321 | #define DECLARE_PIIX_DEV(udma) \ |
328 | { \ | 322 | { \ |
329 | .name = DRV_NAME, \ | 323 | .name = DRV_NAME, \ |
330 | .init_hwif = init_hwif_piix, \ | 324 | .init_hwif = init_hwif_piix, \ |
331 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \ | 325 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \ |
332 | .port_ops = &piix_port_ops, \ | 326 | .port_ops = &piix_port_ops, \ |
333 | .host_flags = IDE_HFLAGS_PIIX, \ | ||
334 | .pio_mask = ATA_PIO4, \ | 327 | .pio_mask = ATA_PIO4, \ |
335 | .swdma_mask = ATA_SWDMA2_ONLY, \ | 328 | .swdma_mask = ATA_SWDMA2_ONLY, \ |
336 | .mwdma_mask = ATA_MWDMA12_ONLY, \ | 329 | .mwdma_mask = ATA_MWDMA12_ONLY, \ |
@@ -344,7 +337,6 @@ static const struct ide_port_ops ich_port_ops = { | |||
344 | .init_hwif = init_hwif_piix, \ | 337 | .init_hwif = init_hwif_piix, \ |
345 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \ | 338 | .enablebits = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \ |
346 | .port_ops = &ich_port_ops, \ | 339 | .port_ops = &ich_port_ops, \ |
347 | .host_flags = IDE_HFLAGS_PIIX, \ | ||
348 | .pio_mask = ATA_PIO4, \ | 340 | .pio_mask = ATA_PIO4, \ |
349 | .swdma_mask = ATA_SWDMA2_ONLY, \ | 341 | .swdma_mask = ATA_SWDMA2_ONLY, \ |
350 | .mwdma_mask = ATA_MWDMA12_ONLY, \ | 342 | .mwdma_mask = ATA_MWDMA12_ONLY, \ |
@@ -360,8 +352,7 @@ static const struct ide_port_info piix_pci_info[] __devinitdata = { | |||
360 | */ | 352 | */ |
361 | .name = DRV_NAME, | 353 | .name = DRV_NAME, |
362 | .enablebits = {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}}, | 354 | .enablebits = {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}}, |
363 | .host_flags = IDE_HFLAG_ISA_PORTS | IDE_HFLAG_NO_DMA | | 355 | .host_flags = IDE_HFLAG_ISA_PORTS | IDE_HFLAG_NO_DMA, |
364 | IDE_HFLAGS_PIIX, | ||
365 | .pio_mask = ATA_PIO4, | 356 | .pio_mask = ATA_PIO4, |
366 | /* This is a painful system best to let it self tune for now */ | 357 | /* This is a painful system best to let it self tune for now */ |
367 | }, | 358 | }, |