diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-24 01:34:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-24 01:34:45 -0400 |
| commit | 771e5ce3bd96f315e213f6263e40b2b2ee7e5201 (patch) | |
| tree | 14b4db952e26bf2ecb7a3770e916524db4e1ca41 /drivers/acpi | |
| parent | 7b806016b14532b4206b81ba16062cf82c68e430 (diff) | |
| parent | 67405439bca28c4dbecd3fefd97fbdb282a302d9 (diff) | |
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) | |||
| 909 | thermal_zone_device_register("acpitz", trips, tz, | 909 | thermal_zone_device_register("acpitz", trips, tz, |
| 910 | &acpi_thermal_zone_ops, | 910 | &acpi_thermal_zone_ops, |
| 911 | 0, 0, 0, | 911 | 0, 0, 0, |
| 912 | tz->polling_frequency); | 912 | tz->polling_frequency*100); |
| 913 | if (IS_ERR(tz->thermal_zone)) | 913 | if (IS_ERR(tz->thermal_zone)) |
| 914 | return -ENODEV; | 914 | return -ENODEV; |
| 915 | 915 | ||