diff options
Diffstat (limited to 'drivers/ide/rapide.c')
-rw-r--r-- | drivers/ide/rapide.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c index d5003ca69801..00f54248f41f 100644 --- a/drivers/ide/rapide.c +++ b/drivers/ide/rapide.c | |||
@@ -13,9 +13,10 @@ | |||
13 | 13 | ||
14 | static const struct ide_port_info rapide_port_info = { | 14 | static const struct ide_port_info rapide_port_info = { |
15 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, | 15 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, |
16 | .chipset = ide_generic, | ||
16 | }; | 17 | }; |
17 | 18 | ||
18 | static void rapide_setup_ports(hw_regs_t *hw, void __iomem *base, | 19 | static void rapide_setup_ports(struct ide_hw *hw, void __iomem *base, |
19 | void __iomem *ctrl, unsigned int sz, int irq) | 20 | void __iomem *ctrl, unsigned int sz, int irq) |
20 | { | 21 | { |
21 | unsigned long port = (unsigned long)base; | 22 | unsigned long port = (unsigned long)base; |
@@ -35,7 +36,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
35 | void __iomem *base; | 36 | void __iomem *base; |
36 | struct ide_host *host; | 37 | struct ide_host *host; |
37 | int ret; | 38 | int ret; |
38 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 39 | struct ide_hw hw, *hws[] = { &hw }; |
39 | 40 | ||
40 | ret = ecard_request_resources(ec); | 41 | ret = ecard_request_resources(ec); |
41 | if (ret) | 42 | if (ret) |
@@ -49,10 +50,9 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
49 | 50 | ||
50 | memset(&hw, 0, sizeof(hw)); | 51 | memset(&hw, 0, sizeof(hw)); |
51 | rapide_setup_ports(&hw, base, base + 0x818, 1 << 6, ec->irq); | 52 | rapide_setup_ports(&hw, base, base + 0x818, 1 << 6, ec->irq); |
52 | hw.chipset = ide_generic; | ||
53 | hw.dev = &ec->dev; | 53 | hw.dev = &ec->dev; |
54 | 54 | ||
55 | ret = ide_host_add(&rapide_port_info, hws, &host); | 55 | ret = ide_host_add(&rapide_port_info, hws, 1, &host); |
56 | if (ret) | 56 | if (ret) |
57 | goto release; | 57 | goto release; |
58 | 58 | ||