diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-14 12:08:53 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-14 12:08:53 -0500 |
| commit | 1226e419377fb4b53d6e08c0a9fd5ecf90597cd6 (patch) | |
| tree | 4dc413e65d771150bea650eeccaf45cf59ef3727 /arch/arm/mach-exynos4/Kconfig | |
| parent | ec5237f097a75b7f4d19b87377ef1557431fb199 (diff) | |
| parent | e82b9d821ecc1f857142a55b0fb38d0d5256fbaf (diff) | |
Merge branch 'thermal_cpu_cooling' of git://git.linaro.org/people/amitdanielk/linux into linaro-3.1linux-linaro-3.1-2011.12-0
Conflicts:
drivers/thermal/Kconfig
drivers/thermal/Makefile
Diffstat (limited to 'arch/arm/mach-exynos4/Kconfig')
| -rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index 3ceefdbadd1..f83526865d1 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -46,6 +46,17 @@ config EXYNOS4_DEV_DWMCI help Compile in platform device definitions for DWMCI +config EXYNOS4_DEV_TMU + bool "Exynos4 tmu device support" + default n + depends on ARCH_EXYNOS4 + ---help--- + Compile in platform device definitions for TMU. This macro also + enables compilation hwmon base TMU driver and also allows compilation + of the platform device files. The platform data in this case is trip + temperature and some tmu h/w configurations related parameter. + + config EXYNOS4_SETUP_I2C1 bool help @@ -224,6 +235,7 @@ config MACH_ORIGEN select S3C_DEV_RTC select S3C_DEV_WDT select S3C_DEV_HSMMC2 + select EXYNOS4_DEV_TMU select EXYNOS4_SETUP_SDHCI help Machine support for ORIGEN based on Samsung EXYNOS4210 |