mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 01:04:08 +08:00
Merge branch 'misc-2.6.32' into release
This commit is contained in:
commit
c4f7bc8627
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user