From bffd3b99133e5db0194dabf349d271ccdb535352 Mon Sep 17 00:00:00 2001
From: AnilKumar Chimata <anilkumar@ti.com>
Date: Sun, 16 Dec 2012 11:30:00 -0800
Subject: [PATCH] --- yaml --- r: 348050 b: refs/heads/master c:
 7a5c6065669c6c226f19e5ad5c9b3d3400b2b136 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dc6ff8710f1b..edad7ddc2163 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0698811fadbed0a8937b15282ccfda2006c7c7c3
+refs/heads/master: 7a5c6065669c6c226f19e5ad5c9b3d3400b2b136
diff --git a/trunk/arch/arm/configs/omap2plus_defconfig b/trunk/arch/arm/configs/omap2plus_defconfig
index ad4119058d71..244568d5dc36 100644
--- a/trunk/arch/arm/configs/omap2plus_defconfig
+++ b/trunk/arch/arm/configs/omap2plus_defconfig
@@ -134,9 +134,11 @@ CONFIG_POWER_SUPPLY=y
 CONFIG_WATCHDOG=y
 CONFIG_OMAP_WATCHDOG=y
 CONFIG_TWL4030_WATCHDOG=y
+CONFIG_MFD_TPS65217=y
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_REGULATOR_TPS65023=y
 CONFIG_REGULATOR_TPS6507X=y
+CONFIG_REGULATOR_TPS65217=y
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y