diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 11:36:52 -0400 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /drivers/acpi/thermal.c | |
| parent | d37dc42ab6f040b8f0f2962ab219c5b2accf748d (diff) | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/thermal.c')
| -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 | ||