diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:37:35 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 11:37:35 +0800 |
commit | 9c1e4550b5cbe17ff68ce631356190ef9a565386 (patch) | |
tree | 04cd872bd8afd2b2fe143e2c17a180a39d1a275c /drivers/thermal/samsung/exynos_thermal_common.h | |
parent | Linux 3.18-rc7 (diff) | |
parent | thermal: of: Extend current of-thermal.c code to allow setting emulated temp (diff) | |
download | linux-dev-9c1e4550b5cbe17ff68ce631356190ef9a565386.tar.xz linux-dev-9c1e4550b5cbe17ff68ce631356190ef9a565386.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into eduardo-soc-thermal
Diffstat (limited to 'drivers/thermal/samsung/exynos_thermal_common.h')
-rw-r--r-- | drivers/thermal/samsung/exynos_thermal_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h index 158f5aa8dc5d..cd4471925cdd 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.h +++ b/drivers/thermal/samsung/exynos_thermal_common.h @@ -27,7 +27,6 @@ #define SENSOR_NAME_LEN 16 #define MAX_TRIP_COUNT 8 #define MAX_COOLING_DEVICE 4 -#define MAX_TRIMINFO_CTRL_REG 2 #define ACTIVE_INTERVAL 500 #define IDLE_INTERVAL 10000 |