---

yaml --- r: 295831 b: refs/heads/master c: b1f91a9 h: refs/heads/master i: 295829: 3c7aba9 295827: 281cc41 295823: 2594c43 v: v3
git-mirror · Feb 27, 2012 · 3f5d8ef · 3f5d8ef
1 parent 5766bc4
commit 3f5d8ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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