Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / arch / arm / configs / omap_3430sdp_defconfig

diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig
index f7b1bd6f00a129d39764006494d2d4b28d7daeb9..b686f34be0e2c5bf68532ceae177bdeaab00bd6d 100644 (file)
--- a/arch/arm/configs/omap_3430sdp_defconfig
+++ b/arch/arm/configs/omap_3430sdp_defconfig
@@ -1165,10 +1165,11 @@ CONFIG_RTC_DRV_TWL4030=y
 #
 # Voltage and Current regulators
 #
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_BQ24022 is not set
+CONFIG_REGULATOR_TWL4030=y
 # CONFIG_UIO is not set
 
 #