Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux

[karo-tx-linux.git] / arch / arm / configs / u8500_defconfig

diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index da353e0755b09cc2e1de5233582a02ed9e3635ca..a0025dc13021af11af524e08e8466c826f802a4a 100644 (file)
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -1,3 +1,4 @@
+CONFIG_HIGHMEM=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
@@ -83,7 +84,8 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MUSB_HDRC=y
 CONFIG_USB_ETH=m
 CONFIG_MMC=y
-CONFIG_MMC_CLKGATE=y
+CONFIG_MMC_UNSAFE_RESUME=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
 CONFIG_MMC_ARMMMCI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y