summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-11-30 10:56:25 +0800
committerAndy Green <andy.green@linaro.org>2011-11-30 10:56:25 +0800
commited4acbc6580cae4c4777969f935d1abee5213735 (patch)
tree448e2d1bec6ac5fd278aff023af6b78a953a6450
parent879562a6c9d61b4eb02caa1dfa350920838f0605 (diff)
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--arch/arm/configs/android_omap4_defconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/android_omap4_defconfig b/arch/arm/configs/android_omap4_defconfig
index 69cd1fffbc0..9654076932a 100644
--- a/arch/arm/configs/android_omap4_defconfig
+++ b/arch/arm/configs/android_omap4_defconfig
@@ -30,6 +30,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_ARCH_OMAP=y
CONFIG_OMAP_MUX_DEBUG=y
+CONFIG_OMAP_SCM_DEV=y
# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
# CONFIG_MACH_OMAP_4430SDP is not set
@@ -157,10 +158,12 @@ CONFIG_GPIO_TWL4030=y
CONFIG_W1=y
CONFIG_POWER_SUPPLY=y
# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_OMAP_WATCHDOG=y
CONFIG_TWL4030_WATCHDOG=y
CONFIG_MFD_TPS65912_I2C=y
+CONFIG_OMAP4460PLUS_SCM=y
CONFIG_REGULATOR_DUMMY=y
CONFIG_REGULATOR_TWL4030=y
CONFIG_REGULATOR_TPS65023=y