From 5873a55fe115bf3b794a4da1ab300bcc2e1bb5b7 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Oct 05 2012 07:12:12 +0000
Subject: Build MMC in on OMAP and Tegra until we work out why modules don't work


---

diff --git a/config-arm-generic b/config-arm-generic
index 5f4fbf4..e2e6a77 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -19,6 +19,8 @@ CONFIG_SMP_ON_UP=y
 
 CONFIG_ARM_ARCH_TIMER=y
 
+CONFIG_CMDLINE=""
+
 # CONFIG_FPE_NWFPE is not set
 CONFIG_FPE_FASTFPE=y
 
@@ -32,12 +34,15 @@ CONFIG_ZBOOT_ROM_BSS=0
 
 CONFIG_ATAGS_PROC=y
 
+#CONFIG_XIP_KERNEL is not set
+
 # DeviceTree
 CONFIG_USE_OF=y
 # CONFIG_OF_SELFTEST is not set
 CONFIG_PROC_DEVICETREE=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 
 # Generic options we want for ARM that aren't defualt
 CONFIG_HIGHMEM=y
@@ -116,6 +121,8 @@ CONFIG_GENERIC_GPIO=y
 CONFIG_MTD=m
 CONFIG_MTD_TESTS=m
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLKDEVS=m
diff --git a/config-arm-kirkwood b/config-arm-kirkwood
index 4d6dbf8..7b5d758 100644
--- a/config-arm-kirkwood
+++ b/config-arm-kirkwood
@@ -2,15 +2,19 @@ CONFIG_ARCH_KIRKWOOD=y
 CONFIG_ARCH_KIRKWOOD_DT=y
 # CONFIG_SMP is not set
 # CONFIG_VFP is not set
+
 CONFIG_MACH_DB88F6281_BP=y
 CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
 CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
+CONFIG_MACH_DLINK_KIRKWOOD_DT=y
 CONFIG_MACH_GURUPLUG=y
 CONFIG_MACH_DREAMPLUG_DT=y
 CONFIG_MACH_DOCKSTAR=y
+CONFIG_MACH_ICONNECT_DT=y
+CONFIG_MACH_IB62X0_DT=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
 CONFIG_MACH_OPENRD_BASE=y
diff --git a/config-arm-omap b/config-arm-omap
index b698e48..ae328f1 100644
--- a/config-arm-omap
+++ b/config-arm-omap
@@ -247,6 +247,15 @@ CONFIG_USB_MUSB_HDRC=y
 
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_ISP1301_OMAP is not set
+
+# This block is temporary until we work out why the MMC modules don't work as modules
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF=y
+CONFIG_MMC_SPI=y
+
 CONFIG_MMC_OMAP=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_TWL4030_USB=y
diff --git a/config-arm-tegra b/config-arm-tegra
index 5ec5a67..015af43 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -27,6 +27,14 @@ CONFIG_TEGRA_IOMMU_SMMU=y
 
 CONFIG_I2C_TEGRA=y
 
+# This block is temporary until we work out why the MMC modules don't work as modules
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PLTFM=y
+CONFIG_MMC_SDHCI_OF=y
+CONFIG_MMC_SPI=y
+
 CONFIG_MMC_SDHCI_TEGRA=y
 
 # CONFIG_RCU_BOOST is not set
diff --git a/kernel.spec b/kernel.spec
index dbb2a4d..8aac3ca 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2327,6 +2327,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Oct  5 2012 Peter Robinson <pbrobinson@fedoraproject.org>
+- Build MMC in on OMAP and Tegra until we work out why modules don't work
+
 * Wed Oct 03 2012 Adam Jackson <ajax@redhat.com>
 - Drop vgem patches, not doing anything yet.