Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / ide / cs5536.c

diff --git a/drivers/ide/cs5536.c b/drivers/ide/cs5536.c
index 7a62db719a46320e6ab5039cd7ebd27b8b3bc3e4..353a35bbba636dcd1d3a22e1dd275efc7894319e 100644 (file)
--- a/drivers/ide/cs5536.c
+++ b/drivers/ide/cs5536.c
@@ -231,12 +231,11 @@ static const struct ide_port_ops cs5536_port_ops = {
 static const struct ide_dma_ops cs5536_dma_ops = {
        .dma_host_set           = ide_dma_host_set,
        .dma_setup              = ide_dma_setup,
-       .dma_exec_cmd           = ide_dma_exec_cmd,
        .dma_start              = cs5536_dma_start,
        .dma_end                = cs5536_dma_end,
        .dma_test_irq           = ide_dma_test_irq,
        .dma_lost_irq           = ide_dma_lost_irq,
-       .dma_timeout            = ide_dma_timeout,
+       .dma_timer_expiry       = ide_dma_sff_timer_expiry,
 };
 
 static const struct ide_port_info cs5536_info = {