Merge tag 'for_3.7-fixes-pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

[~andy/linux] / drivers / staging / omap-thermal / omap5-thermal.c

diff --git a/drivers/staging/omap-thermal/omap5-thermal.c b/drivers/staging/omap-thermal/omap5-thermal.c
index 0658af24a5c76c188c48d20821cdc6729a7421c3..2f3a498dacd126c51867fd7328700012210a10c3 100644 (file)
--- a/drivers/staging/omap-thermal/omap5-thermal.c
+++ b/drivers/staging/omap-thermal/omap5-thermal.c
@@ -268,29 +268,29 @@ const struct omap_bandgap_data omap5430_data = {
        .remove_sensor = omap_thermal_remove_sensor,
        .sensors = {
                {
-                       .registers = &omap5430_mpu_temp_sensor_registers,
-                       .ts_data = &omap5430_mpu_temp_sensor_data,
-                       .domain = "cpu",
-                       .register_cooling = omap_thermal_register_cpu_cooling,
-                       .unregister_cooling = omap_thermal_unregister_cpu_cooling,
-                       .slope = OMAP_GRADIENT_SLOPE_5430_CPU,
-                       .constant = OMAP_GRADIENT_CONST_5430_CPU,
-                       .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_CPU,
-                       .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_CPU,
+               .registers = &omap5430_mpu_temp_sensor_registers,
+               .ts_data = &omap5430_mpu_temp_sensor_data,
+               .domain = "cpu",
+               .register_cooling = omap_thermal_register_cpu_cooling,
+               .unregister_cooling = omap_thermal_unregister_cpu_cooling,
+               .slope = OMAP_GRADIENT_SLOPE_5430_CPU,
+               .constant = OMAP_GRADIENT_CONST_5430_CPU,
+               .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_CPU,
+               .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_CPU,
                },
                {
-                       .registers = &omap5430_gpu_temp_sensor_registers,
-                       .ts_data = &omap5430_gpu_temp_sensor_data,
-                       .domain = "gpu",
-                       .slope = OMAP_GRADIENT_SLOPE_5430_GPU,
-                       .constant = OMAP_GRADIENT_CONST_5430_GPU,
-                       .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU,
-                       .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_GPU,
+               .registers = &omap5430_gpu_temp_sensor_registers,
+               .ts_data = &omap5430_gpu_temp_sensor_data,
+               .domain = "gpu",
+               .slope = OMAP_GRADIENT_SLOPE_5430_GPU,
+               .constant = OMAP_GRADIENT_CONST_5430_GPU,
+               .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU,
+               .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_GPU,
                },
                {
-                       .registers = &omap5430_core_temp_sensor_registers,
-                       .ts_data = &omap5430_core_temp_sensor_data,
-                       .domain = "core",
+               .registers = &omap5430_core_temp_sensor_registers,
+               .ts_data = &omap5430_core_temp_sensor_data,
+               .domain = "core",
                },
        },
        .sensor_count = 3,