aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/icside.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/icside.c')
-rw-r--r--drivers/ide/icside.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 6223b80beb35..c5269fa1f733 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -381,7 +381,7 @@ static int icside_dma_off_init(ide_hwif_t *hwif, const struct ide_port_info *d)
381 return -EOPNOTSUPP; 381 return -EOPNOTSUPP;
382} 382}
383 383
384static void icside_setup_ports(hw_regs_t *hw, void __iomem *base, 384static void icside_setup_ports(struct ide_hw *hw, void __iomem *base,
385 struct cardinfo *info, struct expansion_card *ec) 385 struct cardinfo *info, struct expansion_card *ec)
386{ 386{
387 unsigned long port = (unsigned long)base + info->dataoffset; 387 unsigned long port = (unsigned long)base + info->dataoffset;
@@ -410,7 +410,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
410{ 410{
411 void __iomem *base; 411 void __iomem *base;
412 struct ide_host *host; 412 struct ide_host *host;
413 hw_regs_t hw, *hws[] = { &hw }; 413 struct ide_hw hw, *hws[] = { &hw };
414 int ret; 414 int ret;
415 415
416 base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0); 416 base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
@@ -467,7 +467,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
467 struct ide_host *host; 467 struct ide_host *host;
468 unsigned int sel = 0; 468 unsigned int sel = 0;
469 int ret; 469 int ret;
470 hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1] }; 470 struct ide_hw hw[2], *hws[] = { &hw[0], &hw[1] };
471 struct ide_port_info d = icside_v6_port_info; 471 struct ide_port_info d = icside_v6_port_info;
472 472
473 ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0); 473 ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);