diff options
author | Al Viro <viro@ZenIV.linux.org.uk> | 2008-04-27 09:38:23 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-27 09:38:23 -0400 |
commit | 9c391bae6a65bd39962877ad7dc000b600757bbe (patch) | |
tree | a7e12cca35b88c1dcb4ea6b7d436ac8af4574c5f /drivers/ide/arm | |
parent | c3bf9bc243092c53946fd6d8ebd6dc2f4e572d48 (diff) |
ide: fix icside breakage
Fallout from commit ac95beedf8bc97b24f9540d4da9952f07221c023
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/arm')
-rw-r--r-- | drivers/ide/arm/icside.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c index 7d642f44e35b..c0cf7fc95207 100644 --- a/drivers/ide/arm/icside.c +++ b/drivers/ide/arm/icside.c | |||
@@ -547,14 +547,13 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec) | |||
547 | hwif->config_data = (unsigned long)ioc_base; | 547 | hwif->config_data = (unsigned long)ioc_base; |
548 | hwif->select_data = sel; | 548 | hwif->select_data = sel; |
549 | 549 | ||
550 | mate->maskproc = icside_maskproc; | ||
551 | mate->hwif_data = state; | 550 | mate->hwif_data = state; |
552 | mate->config_data = (unsigned long)ioc_base; | 551 | mate->config_data = (unsigned long)ioc_base; |
553 | mate->select_data = sel | 1; | 552 | mate->select_data = sel | 1; |
554 | 553 | ||
555 | if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) { | 554 | if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) { |
556 | d.init_dma = icside_dma_init; | 555 | d.init_dma = icside_dma_init; |
557 | d.port_ops = &icside_v6_dma_port_ops; | 556 | d.port_ops = &icside_v6_port_ops; |
558 | d.dma_ops = NULL; | 557 | d.dma_ops = NULL; |
559 | } | 558 | } |
560 | 559 | ||