Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[cascardo/linux.git] / drivers / staging / omap-thermal / omap4-thermal.c

diff --git a/drivers/staging/omap-thermal/omap4-thermal.c b/drivers/staging/omap-thermal/omap4-thermal.c
index fa9dbcd..04c02b6 100644 (file)
--- a/drivers/staging/omap-thermal/omap4-thermal.c
+++ b/drivers/staging/omap-thermal/omap4-thermal.c
@@ -77,15 +77,15 @@ const struct omap_bandgap_data omap4430_data = {
        .remove_sensor = omap_thermal_remove_sensor,
        .sensors = {
                {
-                       .registers = &omap4430_mpu_temp_sensor_registers,
-                       .ts_data = &omap4430_mpu_temp_sensor_data,
-                       .domain = "cpu",
-                       .slope = 0,
-                       .constant = 20000,
-                       .slope_pcb = 0,
-                       .constant_pcb = 20000,
-                       .register_cooling = omap_thermal_register_cpu_cooling,
-                       .unregister_cooling = omap_thermal_unregister_cpu_cooling,
+               .registers = &omap4430_mpu_temp_sensor_registers,
+               .ts_data = &omap4430_mpu_temp_sensor_data,
+               .domain = "cpu",
+               .slope = 0,
+               .constant = 20000,
+               .slope_pcb = 0,
+               .constant_pcb = 20000,
+               .register_cooling = omap_thermal_register_cpu_cooling,
+               .unregister_cooling = omap_thermal_unregister_cpu_cooling,
                },
        },
        .sensor_count = 1,
@@ -215,15 +215,15 @@ const struct omap_bandgap_data omap4460_data = {
        .remove_sensor = omap_thermal_remove_sensor,
        .sensors = {
                {
-                       .registers = &omap4460_mpu_temp_sensor_registers,
-                       .ts_data = &omap4460_mpu_temp_sensor_data,
-                       .domain = "cpu",
-                       .slope = OMAP_GRADIENT_SLOPE_4460,
-                       .constant = OMAP_GRADIENT_CONST_4460,
-                       .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4460,
-                       .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4460,
-                       .register_cooling = omap_thermal_register_cpu_cooling,
-                       .unregister_cooling = omap_thermal_unregister_cpu_cooling,
+               .registers = &omap4460_mpu_temp_sensor_registers,
+               .ts_data = &omap4460_mpu_temp_sensor_data,
+               .domain = "cpu",
+               .slope = OMAP_GRADIENT_SLOPE_4460,
+               .constant = OMAP_GRADIENT_CONST_4460,
+               .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4460,
+               .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4460,
+               .register_cooling = omap_thermal_register_cpu_cooling,
+               .unregister_cooling = omap_thermal_unregister_cpu_cooling,
                },
        },
        .sensor_count = 1,
@@ -244,15 +244,15 @@ const struct omap_bandgap_data omap4470_data = {
        .remove_sensor = omap_thermal_remove_sensor,
        .sensors = {
                {
-                       .registers = &omap4460_mpu_temp_sensor_registers,
-                       .ts_data = &omap4460_mpu_temp_sensor_data,
-                       .domain = "cpu",
-                       .slope = OMAP_GRADIENT_SLOPE_4470,
-                       .constant = OMAP_GRADIENT_CONST_4470,
-                       .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4470,
-                       .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4470,
-                       .register_cooling = omap_thermal_register_cpu_cooling,
-                       .unregister_cooling = omap_thermal_unregister_cpu_cooling,
+               .registers = &omap4460_mpu_temp_sensor_registers,
+               .ts_data = &omap4460_mpu_temp_sensor_data,
+               .domain = "cpu",
+               .slope = OMAP_GRADIENT_SLOPE_4470,
+               .constant = OMAP_GRADIENT_CONST_4470,
+               .slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_4470,
+               .constant_pcb = OMAP_GRADIENT_CONST_W_PCB_4470,
+               .register_cooling = omap_thermal_register_cpu_cooling,
+               .unregister_cooling = omap_thermal_unregister_cpu_cooling,
                },
        },
        .sensor_count = 1,