Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[~andy/linux] / drivers / ide / umc8672.c

diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c
index 60f936e2319cb3fef78dab4f05096f535ebe5b72..47adcd09cb26a3c6f867374ec31b9aa6dfb039e1 100644 (file)
--- a/drivers/ide/umc8672.c
+++ b/drivers/ide/umc8672.c
@@ -104,10 +104,11 @@ static void umc_set_speeds(u8 speeds[])
                speeds[0], speeds[1], speeds[2], speeds[3]);
 }
 
-static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio)
+static void umc_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
-       ide_hwif_t *hwif = drive->hwif, *mate = hwif->mate;
+       ide_hwif_t *mate = hwif->mate;
        unsigned long uninitialized_var(flags);
+       const u8 pio = drive->pio_mode - XFER_PIO_0;
 
        printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
                drive->name, pio, pio_to_umc[pio]);