2 files changed, 4 insertions, 3 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index e072bdea907a..d5526d3af623 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -495,6 +495,7 @@ config BLK_DEV_ATIIXP
 
 config BLK_DEV_CMD64X
         tristate "CMD64{3|6|8|9} chipset support"
+        select IDE_TIMINGS
         select BLK_DEV_IDEDMA_PCI
         help
           Say Y here if you have an IDE controller which uses any of these
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index ca4774aa27ee..cfa784bacf48 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -116,6 +116,7 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = to_pci_dev(hwif->dev);
+        struct ide_timing *t    = ide_timing_find_mode(XFER_PIO_0 + pio);
         unsigned int cycle_time;
         u8 setup_count, arttim = 0;
 
@@ -124,10 +125,9 @@ static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
 
         cycle_time = ide_pio_cycle_time(drive, pio);
 
-        program_cycle_times(drive, cycle_time,
-                            ide_pio_timings[pio].active_time);
+        program_cycle_times(drive, cycle_time, t->active);
 
-        setup_count = quantize_timing(ide_pio_timings[pio].setup_time,
+        setup_count = quantize_timing(t->setup,
                         1000 / (ide_pci_clk ? ide_pci_clk : 33));
 
         /*