---

yaml --- r: 275135 b: refs/heads/master c: c862dd7 h: refs/heads/master i: 275133: 77f1bba 275131: 7a58a8a 275127: 411c241 275119: 077822b 275103: c9b5e78 275071: ab5b71d v: v3
git-mirror · Nov 5, 2011 · bfd3852 · bfd3852
1 parent 19c75ff
commit bfd3852
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);