dell-laptop: Fixed typo in touchpad LED quirk

[deliverable/linux.git] / drivers / acpi / thermal.c

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 21dd4c268aefca37746498da131edee6a8c574f0..edda74a43406b5232c01a65ac030303abab830f4 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -106,7 +106,9 @@ static const struct acpi_device_id  thermal_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, thermal_device_ids);
 
+#ifdef CONFIG_PM_SLEEP
 static int acpi_thermal_resume(struct device *dev);
+#endif
 static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume);
 
 static struct acpi_driver acpi_thermal_driver = {
@@ -552,8 +554,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 +590,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 +847,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 +855,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);
@@ -1043,6 +1043,7 @@ static int acpi_thermal_remove(struct acpi_device *device, int type)
        return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int acpi_thermal_resume(struct device *dev)
 {
        struct acpi_thermal *tz;
@@ -1077,6 +1078,7 @@ static int acpi_thermal_resume(struct device *dev)
 
        return AE_OK;
 }
+#endif
 
 static int thermal_act(const struct dmi_system_id *d) {