Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[pandora-kernel.git] / drivers / acpi / thermal.c

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 69ec73b..5f79b44 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1368,7 +1368,7 @@ static int acpi_thermal_resume(struct acpi_device *device)
 }
 
 #ifdef CONFIG_DMI
-static int thermal_act(struct dmi_system_id *d) {
+static int thermal_act(const struct dmi_system_id *d) {
 
        if (act == 0) {
                printk(KERN_NOTICE "ACPI: %s detected: "
@@ -1377,14 +1377,14 @@ static int thermal_act(struct dmi_system_id *d) {
        }
        return 0;
 }
-static int thermal_nocrt(struct dmi_system_id *d) {
+static int thermal_nocrt(const struct dmi_system_id *d) {
 
        printk(KERN_NOTICE "ACPI: %s detected: "
                "disabling all critical thermal trip point actions.\n", d->ident);
        nocrt = 1;
        return 0;
 }
-static int thermal_tzp(struct dmi_system_id *d) {
+static int thermal_tzp(const struct dmi_system_id *d) {
 
        if (tzp == 0) {
                printk(KERN_NOTICE "ACPI: %s detected: "
@@ -1393,7 +1393,7 @@ static int thermal_tzp(struct dmi_system_id *d) {
        }
        return 0;
 }
-static int thermal_psv(struct dmi_system_id *d) {
+static int thermal_psv(const struct dmi_system_id *d) {
 
        if (psv == 0) {
                printk(KERN_NOTICE "ACPI: %s detected: "