Merge branch 'omap-fixes'

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

diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
index 194eafa24bd871a932c83849d9a824d4f87cf0cc..aeeac33b99ac9fbb7becd0956c7f3fd6e6a50a8d 100644 (file)
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
@@ -1040,10 +1040,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
 
 #