diff options
Diffstat (limited to 'drivers/ide/ide-generic.c')
-rw-r--r-- | drivers/ide/ide-generic.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 7812ca0be13b..54d7c4685d23 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c | |||
@@ -29,6 +29,7 @@ MODULE_PARM_DESC(probe_mask, "probe mask for legacy ISA IDE ports"); | |||
29 | 29 | ||
30 | static const struct ide_port_info ide_generic_port_info = { | 30 | static const struct ide_port_info ide_generic_port_info = { |
31 | .host_flags = IDE_HFLAG_NO_DMA, | 31 | .host_flags = IDE_HFLAG_NO_DMA, |
32 | .chipset = ide_generic, | ||
32 | }; | 33 | }; |
33 | 34 | ||
34 | #ifdef CONFIG_ARM | 35 | #ifdef CONFIG_ARM |
@@ -85,7 +86,7 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary) | |||
85 | 86 | ||
86 | static int __init ide_generic_init(void) | 87 | static int __init ide_generic_init(void) |
87 | { | 88 | { |
88 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 89 | struct ide_hw hw, *hws[] = { &hw }; |
89 | unsigned long io_addr; | 90 | unsigned long io_addr; |
90 | int i, rc = 0, primary = 0, secondary = 0; | 91 | int i, rc = 0, primary = 0, secondary = 0; |
91 | 92 | ||
@@ -132,9 +133,7 @@ static int __init ide_generic_init(void) | |||
132 | #else | 133 | #else |
133 | hw.irq = legacy_irqs[i]; | 134 | hw.irq = legacy_irqs[i]; |
134 | #endif | 135 | #endif |
135 | hw.chipset = ide_generic; | 136 | rc = ide_host_add(&ide_generic_port_info, hws, 1, NULL); |
136 | |||
137 | rc = ide_host_add(&ide_generic_port_info, hws, NULL); | ||
138 | if (rc) { | 137 | if (rc) { |
139 | release_region(io_addr + 0x206, 1); | 138 | release_region(io_addr + 0x206, 1); |
140 | release_region(io_addr, 8); | 139 | release_region(io_addr, 8); |