git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
umc8672.c
diff --git
a/drivers/ide/umc8672.c
b/drivers/ide/umc8672.c
index
60f936e
..
47adcd0
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]);
}
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);
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]);
printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
drive->name, pio, pio_to_umc[pio]);