diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-24 07:34:45 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-24 07:34:45 +0200 |
| commit | 771e5ce3bd96f315e213f6263e40b2b2ee7e5201 (patch) | |
| tree | 14b4db952e26bf2ecb7a3770e916524db4e1ca41 /drivers/acpi | |
| parent | Merge branch 'thinkpad-acpi' into release (diff) | |
| parent | thermal: Fix polling frequency for systems without passive cooling (diff) | |
| download | linux-771e5ce3bd96f315e213f6263e40b2b2ee7e5201.tar.xz linux-771e5ce3bd96f315e213f6263e40b2b2ee7e5201.zip | |
Merge branch 'thermal-regression' into release
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 9cd15e8c8932..564ea1424288 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -909,7 +909,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) thermal_zone_device_register("acpitz", trips, tz, &acpi_thermal_zone_ops, 0, 0, 0, - tz->polling_frequency); + tz->polling_frequency*100); if (IS_ERR(tz->thermal_zone)) return -ENODEV; |