From bfd38527860bbe5a1eb0394eddc226537516f35d Mon Sep 17 00:00:00 2001
From: Balaji T K <balajitk@ti.com>
Date: Mon, 3 Oct 2011 17:52:51 +0530
Subject: [PATCH] --- yaml --- r: 275135 b: refs/heads/master c:
 c862dd706759c48a8a45af140330544724f170f9 h: refs/heads/master i:   275133:
 77f1bba38f4e0958e240ecce214bb07e28ed7753   275131:
 7a58a8aa14a28dbb8bd54dd94ce8c85b5b2f97b8   275127:
 411c24186232c0009ed7d579101e8a9de776fefa   275119:
 077822b7082465fbda3400cebff09dcbea40a805   275103:
 c9b5e78f0880f8d546cec85adb6609ff719f725b   275071:
 ab5b71d04a10031b4850aa9f44c0bd24d5a81375 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/mach-omap2/hsmmc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1578dcee1fbb..0801ff1a62c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff2beb1d9f2fecc3f5c1d67bfec1183a5a476586
+refs/heads/master: c862dd706759c48a8a45af140330544724f170f9
diff --git a/trunk/arch/arm/mach-omap2/hsmmc.c b/trunk/arch/arm/mach-omap2/hsmmc.c
index d663649f6923..f4a1020559a7 100644
--- a/trunk/arch/arm/mach-omap2/hsmmc.c
+++ b/trunk/arch/arm/mach-omap2/hsmmc.c
@@ -479,7 +479,7 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
 			OMAP4_SDMMC1_PUSTRENGTH_GRP1_MASK);
 		reg &= ~(OMAP4_SDMMC1_PUSTRENGTH_GRP2_MASK |
 			OMAP4_SDMMC1_PUSTRENGTH_GRP3_MASK);
-		reg |= (OMAP4_USBC1_DR0_SPEEDCTRL_MASK|
+		reg |= (OMAP4_SDMMC1_DR0_SPEEDCTRL_MASK |
 			OMAP4_SDMMC1_DR1_SPEEDCTRL_MASK |
 			OMAP4_SDMMC1_DR2_SPEEDCTRL_MASK);
 		omap4_ctrl_pad_writel(reg, control_mmc1);