diff options
Diffstat (limited to 'drivers/acpi/thermal.c')
| -rw-r--r-- | drivers/acpi/thermal.c | 10 | 
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 21dd4c268ae..9fe90e9fecb 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -552,8 +552,6 @@ static int thermal_get_temp(struct thermal_zone_device *thermal,  	return 0;  } -static const char enabled[] = "kernel"; -static const char disabled[] = "user";  static int thermal_get_mode(struct thermal_zone_device *thermal,  				enum thermal_device_mode *mode)  { @@ -590,8 +588,8 @@ static int thermal_set_mode(struct thermal_zone_device *thermal,  	if (enable != tz->tz_enabled) {  		tz->tz_enabled = enable;  		ACPI_DEBUG_PRINT((ACPI_DB_INFO, -			"%s ACPI thermal control\n", -			tz->tz_enabled ? enabled : disabled)); +			"%s kernel ACPI thermal control\n", +			tz->tz_enabled ? "Enable" : "Disable"));  		acpi_thermal_check(tz);  	}  	return 0; @@ -847,7 +845,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)  	if (tz->trips.passive.flags.valid)  		tz->thermal_zone = -			thermal_zone_device_register("acpitz", trips, tz, +			thermal_zone_device_register("acpitz", trips, 0, tz,  						     &acpi_thermal_zone_ops,  						     tz->trips.passive.tc1,  						     tz->trips.passive.tc2, @@ -855,7 +853,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)  						     tz->polling_frequency*100);  	else  		tz->thermal_zone = -			thermal_zone_device_register("acpitz", trips, tz, +			thermal_zone_device_register("acpitz", trips, 0, tz,  						     &acpi_thermal_zone_ops,  						     0, 0, 0,  						     tz->polling_frequency*100);  |