From 3f5d8eff3980925e2817c847d34dbe075fe2c45b Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 27 Feb 2012 15:36:38 +0800
Subject: [PATCH] --- yaml --- r: 295831 b: refs/heads/master c:
 b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b h: refs/heads/master i:   295829:
 3c7aba9840cf30843886c997d68c6ad8abcddb5e   295827:
 281cc41ac7a26ff525ca65b010ac15d422368134   295823:
 2594c432bb9d158b7cc36c18ba8225c1d2703b44 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/arm/configs/imx_v6_v7_defconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7b39ab05ec37..1265ff79dd1b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9394243fc8b350cd0837a4d91fc21e7966e509e3
+refs/heads/master: b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b
diff --git a/trunk/arch/arm/configs/imx_v6_v7_defconfig b/trunk/arch/arm/configs/imx_v6_v7_defconfig
index fa236a2a4661..3cd606905178 100644
--- a/trunk/arch/arm/configs/imx_v6_v7_defconfig
+++ b/trunk/arch/arm/configs/imx_v6_v7_defconfig
@@ -124,6 +124,7 @@ CONFIG_WATCHDOG=y
 CONFIG_IMX2_WDT=y
 CONFIG_MFD_MC13XXX=y
 CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_MC13892=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y