Merge branch 'devel' into next

[pandora-kernel.git] / drivers / ide / legacy / ht6560b.c

diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 4fe516d..dd6dfb3 100644 (file)
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -212,7 +212,7 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
 {
        int active_time, recovery_time;
        int active_cycles, recovery_cycles;
-       int bus_speed = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();
+       int bus_speed = ide_vlb_clk ? ide_vlb_clk : 50;
 
         if (pio) {
                unsigned int cycle_time;