diff options
Diffstat (limited to 'drivers/ide/at91_ide.c')
-rw-r--r-- | drivers/ide/at91_ide.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c index 403d0e4265db..fc0949a8cfde 100644 --- a/drivers/ide/at91_ide.c +++ b/drivers/ide/at91_ide.c | |||
@@ -216,6 +216,7 @@ static const struct ide_port_info at91_ide_port_info __initdata = { | |||
216 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE | | 216 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE | |
217 | IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS, | 217 | IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS, |
218 | .pio_mask = ATA_PIO6, | 218 | .pio_mask = ATA_PIO6, |
219 | .chipset = ide_generic, | ||
219 | }; | 220 | }; |
220 | 221 | ||
221 | /* | 222 | /* |
@@ -246,8 +247,7 @@ irqreturn_t at91_irq_handler(int irq, void *dev_id) | |||
246 | static int __init at91_ide_probe(struct platform_device *pdev) | 247 | static int __init at91_ide_probe(struct platform_device *pdev) |
247 | { | 248 | { |
248 | int ret; | 249 | int ret; |
249 | hw_regs_t hw; | 250 | struct ide_hw hw, *hws[] = { &hw }; |
250 | hw_regs_t *hws[] = { &hw, NULL, NULL, NULL }; | ||
251 | struct ide_host *host; | 251 | struct ide_host *host; |
252 | struct resource *res; | 252 | struct resource *res; |
253 | unsigned long tf_base = 0, ctl_base = 0; | 253 | unsigned long tf_base = 0, ctl_base = 0; |
@@ -304,10 +304,9 @@ static int __init at91_ide_probe(struct platform_device *pdev) | |||
304 | ide_std_init_ports(&hw, tf_base, ctl_base + 6); | 304 | ide_std_init_ports(&hw, tf_base, ctl_base + 6); |
305 | 305 | ||
306 | hw.irq = board->irq_pin; | 306 | hw.irq = board->irq_pin; |
307 | hw.chipset = ide_generic; | ||
308 | hw.dev = &pdev->dev; | 307 | hw.dev = &pdev->dev; |
309 | 308 | ||
310 | host = ide_host_alloc(&at91_ide_port_info, hws); | 309 | host = ide_host_alloc(&at91_ide_port_info, hws, 1); |
311 | if (!host) { | 310 | if (!host) { |
312 | perr("failed to allocate ide host\n"); | 311 | perr("failed to allocate ide host\n"); |
313 | return -ENOMEM; | 312 | return -ENOMEM; |