From 73caef44238378f48077822219ecdcc84df0a804 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 16 Jul 2008 20:33:38 +0200 Subject: [PATCH] --- yaml --- r: 102084 b: refs/heads/master c: 3f847571a1cf845a338bcd352f31240b3615f40d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/Kconfig | 1 + trunk/drivers/ide/pci/sl82c105.c | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index eeb26e74daa3..cba25ce43f3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 713a590dea9a61e84f2837e75c5e9429d95908b5 +refs/heads/master: 3f847571a1cf845a338bcd352f31240b3615f40d diff --git a/trunk/drivers/ide/Kconfig b/trunk/drivers/ide/Kconfig index 7446db649064..5f4d6ea379f6 100644 --- a/trunk/drivers/ide/Kconfig +++ b/trunk/drivers/ide/Kconfig @@ -703,6 +703,7 @@ config BLK_DEV_SIS5513 config BLK_DEV_SL82C105 tristate "Winbond SL82c105 support" depends on (PPC || ARM) + select IDE_TIMINGS select BLK_DEV_IDEDMA_PCI help If you have a Winbond SL82c105 IDE controller, say Y here to enable diff --git a/trunk/drivers/ide/pci/sl82c105.c b/trunk/drivers/ide/pci/sl82c105.c index ce84fa045d39..6efbde297174 100644 --- a/trunk/drivers/ide/pci/sl82c105.c +++ b/trunk/drivers/ide/pci/sl82c105.c @@ -47,10 +47,11 @@ */ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio) { + struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio); unsigned int cmd_on, cmd_off; u8 iordy = 0; - cmd_on = (ide_pio_timings[pio].active_time + 29) / 30; + cmd_on = (t->active + 29) / 30; cmd_off = (ide_pio_cycle_time(drive, pio) - 30 * cmd_on + 29) / 30; if (cmd_on == 0)