Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[~andy/linux] / drivers / staging / omap-thermal / omap-bandgap.h

diff --git a/drivers/staging/omap-thermal/omap-bandgap.h b/drivers/staging/omap-thermal/omap-bandgap.h
index 78aed7535f4719cba0053d4c20bb0e2d87e55489..2bb14bd7c6d98d27a23a0fac2f6e6dec9b5d258d 100644 (file)
--- a/drivers/staging/omap-thermal/omap-bandgap.h
+++ b/drivers/staging/omap-thermal/omap-bandgap.h
@@ -335,14 +335,6 @@ struct temp_sensor_regval {
        u32                     tshut_threshold;
 };
 
-/**
- * struct thermal_cooling_conf - description on how to cool a thermal zone
- * @freq_clip_count: size of freq_data
- */
-struct thermal_cooling_conf {
-       int freq_clip_count;
-};
-
 /**
  * struct omap_temp_sensor - bandgap temperature sensor platform data
  * @ts_data: pointer to struct with thresholds, limits of temperature sensor
@@ -365,7 +357,6 @@ struct omap_temp_sensor {
        struct temp_sensor_registers    *registers;
        struct temp_sensor_regval       regval;
        char                            *domain;
-       struct thermal_cooling_conf     cooling_data;
        /* for hotspot extrapolation */
        const int                       slope;
        const int                       constant;