diff --git a/[refs] b/[refs]
index 250c390a81f1..975ed0023df4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4679232d3a2085fa5080f260d68b4049c14d5b76
+refs/heads/master: 839c978794f3d2d0dce4693bbb087f9507bbab9b
diff --git a/trunk/arch/arm/configs/omap3_evm_defconfig b/trunk/arch/arm/configs/omap3_evm_defconfig
index d5ff4776cd0a..36c99e09c8ce 100644
--- a/trunk/arch/arm/configs/omap3_evm_defconfig
+++ b/trunk/arch/arm/configs/omap3_evm_defconfig
@@ -1126,7 +1126,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_OMAP is not set
-CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_OMAP_HS=y
 # CONFIG_MMC_SPI is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_ACCESSIBILITY is not set