diff options
Diffstat (limited to 'drivers/ide/au1xxx-ide.c')
-rw-r--r-- | drivers/ide/au1xxx-ide.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c index 46013644c965..58121bd6c115 100644 --- a/drivers/ide/au1xxx-ide.c +++ b/drivers/ide/au1xxx-ide.c | |||
@@ -449,7 +449,7 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d) | |||
449 | } | 449 | } |
450 | #endif | 450 | #endif |
451 | 451 | ||
452 | static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif) | 452 | static void auide_setup_ports(struct ide_hw *hw, _auide_hwif *ahwif) |
453 | { | 453 | { |
454 | int i; | 454 | int i; |
455 | unsigned long *ata_regs = hw->io_ports_array; | 455 | unsigned long *ata_regs = hw->io_ports_array; |
@@ -499,6 +499,7 @@ static const struct ide_port_info au1xxx_port_info = { | |||
499 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 499 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
500 | .mwdma_mask = ATA_MWDMA2, | 500 | .mwdma_mask = ATA_MWDMA2, |
501 | #endif | 501 | #endif |
502 | .chipset = ide_au1xxx, | ||
502 | }; | 503 | }; |
503 | 504 | ||
504 | static int au_ide_probe(struct platform_device *dev) | 505 | static int au_ide_probe(struct platform_device *dev) |
@@ -507,7 +508,7 @@ static int au_ide_probe(struct platform_device *dev) | |||
507 | struct resource *res; | 508 | struct resource *res; |
508 | struct ide_host *host; | 509 | struct ide_host *host; |
509 | int ret = 0; | 510 | int ret = 0; |
510 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 511 | struct ide_hw hw, *hws[] = { &hw }; |
511 | 512 | ||
512 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | 513 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) |
513 | char *mode = "MWDMA2"; | 514 | char *mode = "MWDMA2"; |
@@ -548,9 +549,8 @@ static int au_ide_probe(struct platform_device *dev) | |||
548 | auide_setup_ports(&hw, ahwif); | 549 | auide_setup_ports(&hw, ahwif); |
549 | hw.irq = ahwif->irq; | 550 | hw.irq = ahwif->irq; |
550 | hw.dev = &dev->dev; | 551 | hw.dev = &dev->dev; |
551 | hw.chipset = ide_au1xxx; | ||
552 | 552 | ||
553 | ret = ide_host_add(&au1xxx_port_info, hws, &host); | 553 | ret = ide_host_add(&au1xxx_port_info, hws, 1, &host); |
554 | if (ret) | 554 | if (ret) |
555 | goto out; | 555 | goto out; |
556 | 556 | ||