From fceb3510c2f0c7dfbf79ff2971e2863c8a89836b Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sun, 1 Sep 2013 13:32:03 +0100
Subject: [PATCH] Build in OMAP MMC again (fix at least omap3)

---
 arm-omap-bbb-dts.patch => arm-am33xx-bbb-dts.patch |  0
 config-armv7                                       |  6 ++----
 kernel.spec                                        | 10 ++++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename arm-omap-bbb-dts.patch => arm-am33xx-bbb-dts.patch (100%)

diff --git a/arm-omap-bbb-dts.patch b/arm-am33xx-bbb-dts.patch
similarity index 100%
rename from arm-omap-bbb-dts.patch
rename to arm-am33xx-bbb-dts.patch
diff --git a/config-armv7 b/config-armv7
index 1b2c1127b..594c3a45e 100644
--- a/config-armv7
+++ b/config-armv7
@@ -123,7 +123,6 @@ CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
-CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
 
@@ -178,9 +177,8 @@ CONFIG_USB_GADGET_MUSB_HDRC=m
 # CONFIG_MUSB_PIO_ONLY is not set
 # CONFIG_USB_MUSB_DEBUG is not set
 CONFIG_OMAP_CONTROL_USB=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_MMC_OMAP=m
-CONFIG_MMC_OMAP_HS=m
+CONFIG_MMC_OMAP=y
+CONFIG_MMC_OMAP_HS=y
 CONFIG_RTC_DRV_MAX8907=m
 # CONFIG_RTC_DRV_TWL92330 is not set
 CONFIG_RTC_DRV_TWL4030=y
diff --git a/kernel.spec b/kernel.spec
index bb1acb0fc..35da1b0b7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -711,7 +711,7 @@ Patch21030: arm-wandboard-quad.patch
 Patch21031: arm-imx-fixsound.patch
 
 # AM33xx
-Patch21040: arm-omap-bbb-dts.patch
+Patch21040: arm-am33xx-bbb-dts.patch
 
 #rhbz 754518
 Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1316,7 +1316,10 @@ ApplyPatch arm-omap-load-tfp410.patch
 ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 ApplyPatch arm-wandboard-quad.patch
 ApplyPatch arm-imx-fixsound.patch
-#ApplyPatch arm-omap-bbb-dts.patch
+
+# Fix OMAP and AM33xx (BeagleBone)
+#pplyPatch arm-am33xx-bbb-dts.patch
+
 #
 # bugfixes to drivers and filesystems
 #
@@ -2261,6 +2264,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sun Sep  1 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Build in OMAP MMC again (fix at least omap3)
+
 * Sat Aug 31 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.11.0-0.rc7.git4.1
 - Linux v3.11-rc7-42-gd9eda0f