diff options
| author | Len Brown <len.brown@intel.com> | 2009-11-25 01:01:29 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-11-25 01:01:29 -0500 |
| commit | c4f7bc86279269d0e9520ded0617c609fd5e573a (patch) | |
| tree | 0cea2585186c264d74797609905aac287b7dd0ad | |
| parent | 644417958b0bbb1dbf79003fc14e6ccf1271b9ad (diff) | |
| parent | 7005291706341a11c094f39a756a01c9e649e5f9 (diff) | |
| download | linux-c4f7bc86279269d0e9520ded0617c609fd5e573a.tar.gz linux-c4f7bc86279269d0e9520ded0617c609fd5e573a.tar.bz2 linux-c4f7bc86279269d0e9520ded0617c609fd5e573a.zip | |
Merge branch 'misc-2.6.32' into release
| -rw-r--r-- | drivers/platform/x86/acerhdf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 0a8f735f6c4a..ab64522aaa64 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -52,7 +52,7 @@ */ #undef START_IN_KERNEL_MODE -#define DRV_VER "0.5.17" +#define DRV_VER "0.5.18" /* * According to the Atom N270 datasheet, @@ -61,7 +61,7 @@ * measured by the on-die thermal monitor are within 0 <= Tj <= 90. So, * assume 89°C is critical temperature. */ -#define ACERHDF_TEMP_CRIT 89 +#define ACERHDF_TEMP_CRIT 89000 #define ACERHDF_FAN_OFF 0 #define ACERHDF_FAN_AUTO 1 @@ -69,7 +69,7 @@ * No matter what value the user puts into the fanon variable, turn on the fan * at 80 degree Celsius to prevent hardware damage */ -#define ACERHDF_MAX_FANON 80 +#define ACERHDF_MAX_FANON 80000 /* * Maximum interval between two temperature checks is 15 seconds, as the die @@ -85,8 +85,8 @@ static int kernelmode; #endif static unsigned int interval = 10; -static unsigned int fanon = 63; -static unsigned int fanoff = 58; +static unsigned int fanon = 63000; +static unsigned int fanoff = 58000; static unsigned int verbose; static unsigned int fanstate = ACERHDF_FAN_AUTO; static char force_bios[16]; @@ -171,7 +171,7 @@ static int acerhdf_get_temp(int *temp) if (ec_read(bios_cfg->tempreg, &read_temp)) return -EINVAL; - *temp = read_temp; + *temp = read_temp * 1000; return 0; } |