From 390fae1d3bd8cc62a21ceb35032486c5ae59905c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Aug 01 2013 19:40:19 +0000
Subject: Minor ARM config update


---

diff --git a/config-armv7 b/config-armv7
index 4e7d253..395a8a8 100644
--- a/config-armv7
+++ b/config-armv7
@@ -406,6 +406,7 @@ CONFIG_RTC_DRV_MXC=m
 # CONFIG_MX3_IPU_IRQS is not set
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_DMA=m
+CONFIG_AHCI_IMX=m
 # CONFIG_MXS_DMA is not set
 CONFIG_PWM_IMX=m
 CONFIG_BACKLIGHT_PWM=m
@@ -554,7 +555,6 @@ CONFIG_MMC_SDHCI_PXAV2=m
 
 # Multi function devices
 CONFIG_MFD_CORE=m
-CONFIG_MFD_SYSCON=y
 CONFIG_MFD_88PM800=m
 CONFIG_MFD_88PM805=m
 CONFIG_MFD_T7L66XB=y
diff --git a/config-armv7-generic b/config-armv7-generic
index d1f1d45..113fea7 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -259,7 +259,6 @@ CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
 CONFIG_MMC_DW_SOCFPGA=m
-CONFIG_USB_DWC3=m
 # CONFIG_MMC_DW_EXYNOS is not set
 # CONFIG_MMC_DW_IDMAC is not set
 CONFIG_USB_DWC2=m
@@ -413,6 +412,7 @@ CONFIG_BPF_JIT=y
 # CONFIG_DRM_EXYNOS is not set
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
+# CONFIG_AHCI_IMX is not set
 # CONFIG_CS89x0 is not set
 # CONFIG_DM9000 is not set
 # CONFIG_HW_RANDOM_ATMEL is not set
@@ -461,4 +461,3 @@ CONFIG_BPF_JIT=y
 
 # FIX ME
 # CONFIG_FB_XILINX is not set
-CONFIG_AHCI_IMX=m
diff --git a/kernel.spec b/kernel.spec
index 51bb6e7..8a8295a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2272,6 +2272,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Aug  1 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config update
+
 * Thu Aug 01 2013 Josh Boyer <jwboyer@redhat.com>
 - Fix mac80211 connection issues (rhbz 981445)
 - Fix firmware issues with iwl4965 and rfkill (rhbz 977053)