Enable mmc driver in Merrfield configuration

BZ: 27386

The current Merrifield default configuration file
disable mmc driver by default. This patch enable it.

Change-Id: Ic3ec76e2f103acc30815faf26b71367382396981
Signed-off-by: Yunpeng Gao <yunpeng.gao@intel.com>
Reviewed-on: http://android.intel.com:8080/40285
Reviewed-by: Tang, Richard <richard.tang@intel.com>
Tested-by: Sun, Jianhua <jianhua.sun@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/configs/i386_mrfl_defconfig b/arch/x86/configs/i386_mrfl_defconfig
index 64a13a1..910fc4e 100644 (file)
--- a/arch/x86/configs/i386_mrfl_defconfig
+++ b/arch/x86/configs/i386_mrfl_defconfig
@@ -822,6 +822,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
 #
 # Bluetooth device drivers
 #
+# CONFIG_BT_HCIBTSDIO is not set
 CONFIG_BT_HCIUART=y
 # CONFIG_BT_HCIUART_H4 is not set
 # CONFIG_BT_HCIUART_BCSP is not set
@@ -943,6 +944,7 @@ CONFIG_UUID=y
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_CB710_CORE is not set
+# CONFIG_IWMC3200TOP is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1046,11 +1048,14 @@ CONFIG_WLAN=y
 # CONFIG_ATH_COMMON is not set
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
+# CONFIG_BCM4329 is not set
+# CONFIG_BCMDHD is not set
 # CONFIG_HOSTAP is not set
 # CONFIG_IPW2100 is not set
 # CONFIG_IWLAGN is not set
 # CONFIG_IWL4965 is not set
 # CONFIG_IWL3945 is not set
+# CONFIG_IWM is not set
 # CONFIG_LIBERTAS is not set
 # CONFIG_P54_COMMON is not set
 # CONFIG_RT2X00 is not set
@@ -1061,6 +1066,7 @@ CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
 # CONFIG_WL12XX_HT is not set
 # CONFIG_WL12XX_SPI is not set
+# CONFIG_WL12XX_SDIO is not set
 CONFIG_WL12XX_PLATFORM_DATA=y
 # CONFIG_MWIFIEX is not set
 
@@ -1794,7 +1800,34 @@ CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_UWB is not set
-# CONFIG_MMC is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+# CONFIG_MMC_EMBEDDED_SDIO is not set
+# CONFIG_MMC_PARANOID_SD_INIT is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_MMC_BLOCK_DEFERRED_RESUME is not set
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
+# CONFIG_MMC_RICOH_MMC is not set
+# CONFIG_MMC_SDHCI_PLTFM is not set
+# CONFIG_MMC_WBSD is not set
+# CONFIG_MMC_TIFM_SD is not set
+# CONFIG_MMC_CB710 is not set
+# CONFIG_MMC_VIA_SDMMC is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NFC_DEVICES is not set