summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/Kconfig
diff options
context:
space:
mode:
authorNitin Kumbhar <nkumbhar@nvidia.com>2010-12-23 14:58:35 +0530
committerNitin Kumbhar <nkumbhar@nvidia.com>2010-12-23 14:58:35 +0530
commit96a476b53360de76f20774122111f031be9ac9c2 (patch)
treee603fb33cb93cac7bbcc750bbaea8010a22dcea7 /arch/arm/mach-tegra/Kconfig
parent8302d262e4801d44fa1b1952e15666256692b7b6 (diff)
parent3f29a8834975956ed5590959bfced00cb9bd03ed (diff)
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts: arch/arm/mach-tegra/board-ventana-power.c drivers/mfd/tps6586x.c Change-Id: Ic8c46d4251d6e71fa2900b7e876f87e256299bc4
Diffstat (limited to 'arch/arm/mach-tegra/Kconfig')
-rw-r--r--arch/arm/mach-tegra/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 1412df271021..f38f4ed94b5b 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -108,3 +108,10 @@ config TEGRA_IOVMM
config TEGRA_ARB_SEMAPHORE
bool
+
+config TEGRA_THERMAL_THROTTLE
+ bool "Enable throttling of CPU speed on overtemp"
+ depends on CPU_FREQ
+ default y
+ help
+ Also requires enabling a temperature sensor such as NCT1008.