summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVarun Wadekar <vwadekar@nvidia.com>2011-01-11 17:54:26 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2011-01-11 10:08:41 -0800
commitfaee24b8ccfded64fd3baf5ba5cf7ee570cfeb5e (patch)
tree7a114f65f6cd2ec258860f44dd518badf679ce0b
parentc10605557b35ed7e8e70322daa8925b70be27056 (diff)
[ARM] tegra: ventana: enable thermal throttling
Bug 742230 Change-Id: Ia628bafbfd2bf42be216edab67c6c21d9ac912fe Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/15498 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_defconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 24954eb53460..c444cf540cba 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36.2
-# Thu Jan 6 10:13:00 2011
+# Linux kernel version: 2.6.36.3
+# Tue Jan 11 17:53:49 2011
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -279,7 +279,7 @@ CONFIG_TEGRA_CPU_DVFS=y
CONFIG_TEGRA_CORE_DVFS=y
CONFIG_TEGRA_IOVMM_GART=y
CONFIG_TEGRA_IOVMM=y
-# CONFIG_TEGRA_THERMAL_THROTTLE is not set
+CONFIG_TEGRA_THERMAL_THROTTLE=y
#
# Processor Type
@@ -922,6 +922,7 @@ CONFIG_KERNEL_DEBUGGER_CORE=y
# CONFIG_SENSORS_BH1780 is not set
# CONFIG_HMC6352 is not set
# CONFIG_SENSORS_AK8975 is not set
+CONFIG_SENSORS_NCT1008=y
# CONFIG_DS1682 is not set
# CONFIG_TI_DAC7512 is not set
# CONFIG_UID_STAT is not set
@@ -1402,7 +1403,6 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_MAX1111 is not set
# CONFIG_SENSORS_MAX1619 is not set
# CONFIG_SENSORS_MAX6650 is not set
-CONFIG_SENSORS_NCT1008_I2C=y
# CONFIG_SENSORS_PC87360 is not set
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_PCF8591 is not set
@@ -1670,6 +1670,7 @@ CONFIG_TEGRA_I2S=y
CONFIG_TEGRA_IEC=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
+# CONFIG_SND_SOC_WM8753 is not set
CONFIG_SND_SOC_WM8903=y
# CONFIG_SOUND_PRIME is not set
CONFIG_HID_SUPPORT=y