diff options
| author | Len Brown <len.brown@intel.com> | 2007-12-06 16:26:52 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-06 16:26:52 -0500 |
| commit | f7a5274d7dde0022dedfb6bca5b4438bbf30e9ce (patch) | |
| tree | 01a9683776b38bf82c136aebbff9ec2a62540a33 /drivers | |
| parent | ceaeee6ad6c2a24bf37d9f426414cf3007432352 (diff) | |
| parent | 74d0f3338fbb3c69894968df1fedaf10c88cd0e4 (diff) | |
Pull suspend-2.6.24 into release branch
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/coretemp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 5c82ec7f8bb..3ee60d26e3a 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -337,11 +337,10 @@ static int coretemp_cpu_callback(struct notifier_block *nfb, switch (action) { case CPU_ONLINE: - case CPU_ONLINE_FROZEN: + case CPU_DOWN_FAILED: coretemp_device_add(cpu); break; - case CPU_DEAD: - case CPU_DEAD_FROZEN: + case CPU_DOWN_PREPARE: coretemp_device_remove(cpu); break; } |