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

[can-eth-gw-linux.git] / drivers / acpi / thermal.c

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 6e8cc16b54c151f3388d57e3325772b2d8db8e53..506fbd4b5733b5f1751d8c23521aaa398447e33d 100644 (file)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -900,14 +900,14 @@ 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, 0, tz,
-                                                    &acpi_thermal_zone_ops,
+                                               &acpi_thermal_zone_ops, NULL,
                                                     tz->trips.passive.tsp*100,
                                                     tz->polling_frequency*100);
        else
                tz->thermal_zone =
                        thermal_zone_device_register("acpitz", trips, 0, tz,
-                                                    &acpi_thermal_zone_ops, 0,
-                                                    tz->polling_frequency*100);
+                                               &acpi_thermal_zone_ops, NULL,
+                                               0, tz->polling_frequency*100);
        if (IS_ERR(tz->thermal_zone))
                return -ENODEV;