[PATCH 2/8] UBUNTU: [Config] FTBFS arm[hf|el]/omap: disable MMC_DW_EXYNOS

[Paolo Pisati]

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/armel/config.common.armel     |    1 +
 debian.master/config/armhf/config.flavour.highbank |    1 +
 debian.master/config/armhf/config.flavour.omap     |    1 +
 debian.master/config/config.common.ubuntu          |    1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 00ecae6..a7b77ef 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -130,6 +130,7 @@ CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=y
 CONFIG_MINIX_SUBPARTITION=y
 CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_DW_EXYNOS is not set
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MODULE_SRCVERSION_ALL=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 01e2a5f..4b4af25 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -86,6 +86,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_MMC_DW_EXYNOS=m
 CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODVERSIONS is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 493d09b..6e3bb6f 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -86,6 +86,7 @@ CONFIG_MFD_WM831X_SPI=y
 CONFIG_MFD_WM8350_I2C=y
 CONFIG_MFD_WM8994=y
 CONFIG_MINIX_SUBPARTITION=y
+# CONFIG_MMC_DW_EXYNOS is not set
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODVERSIONS=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index b97779e..f7b0dcd 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3405,7 +3405,6 @@ CONFIG_MMC_CB710=m
 # CONFIG_MMC_CLKGATE is not set
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_DW=m
-CONFIG_MMC_DW_EXYNOS=m
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_OMAP=m
-- 
1.7.10.4