diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/macintosh/therm_pm72.c | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
| download | talos-op-linux-041387d98460b3947587929ef3a4773b8c48538f.tar.gz talos-op-linux-041387d98460b3947587929ef3a4773b8c48538f.zip | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/macintosh/therm_pm72.c')
| -rw-r--r-- | drivers/macintosh/therm_pm72.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 3fc8cdd94c3d..5bb36274a5c6 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c @@ -933,7 +933,7 @@ static void do_monitor_cpu_combined(void) if (state0->overtemp > 0) { state0->rpm = state0->mpu.rmaxn_exhaust_fan; state0->intake_rpm = intake = state0->mpu.rmaxn_intake_fan; - pump = state0->pump_min; + pump = state0->pump_max; goto do_set_fans; } |
