LINARO: update configs

Signed-off-by: John Rigby <john.rigby@linaro.org>

5 files changed, 2 insertions, 7 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 9aadad10df5..21ba3c59fc4 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -147,7 +147,6 @@ CONFIG_MII=m
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_UNSAFE_RESUME is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 2794ea5be5b..bf05df755d8 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -319,7 +319,6 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_W1=y
 CONFIG_WATCHDOG=y
 CONFIG_WIRELESS=y
-CONFIG_WL12XX_MENU=m
 CONFIG_WLAN=y
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_USER=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index 4c5ac49363c..f1721f7a20b 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -131,7 +131,6 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
 # CONFIG_MISC_DEVICES is not set
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_MMC is not set
-# CONFIG_MMC_SDHCI_PLTFM is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
@@ -231,7 +230,6 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_W1 is not set
 # CONFIG_WATCHDOG is not set
 CONFIG_WIRELESS=y
-# CONFIG_WL12XX_MENU is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_USER is not set
 CONFIG_ZBOOT_ROM_BSS=0
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 6d9a1f61837..123022b52a6 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -82,7 +82,6 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FTRACE is not set
-# CONFIG_FUNCTION_TRACER is not set
 # CONFIG_FUSE_FS is not set
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_SYSFS is not set
@@ -139,7 +138,6 @@ CONFIG_MISC_DEVICES=y
 # CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_MMC=y
 # CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SDHCI_PLTFM is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
 # CONFIG_MODULE_FORCE_LOAD is not set
 # CONFIG_MODULE_FORCE_UNLOAD is not set
@@ -234,7 +232,6 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_W1 is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_WIRELESS is not set
-# CONFIG_WL12XX_MENU is not set
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_USER is not set
 CONFIG_ZBOOT_ROM_BSS=0
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index dc824c34033..269583fb7b2 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -1045,6 +1045,7 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 # CONFIG_MMC_SDHCI_OF is not set
+CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_USHC is not set
@@ -2043,6 +2044,7 @@ CONFIG_WIRELESS_EXT_SYSFS=y
 # CONFIG_WL1251 is not set
 CONFIG_WL12XX=m
 CONFIG_WL12XX_HT=y
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_WL12XX_SDIO=m
 # CONFIG_WL12XX_SDIO_TEST is not set