From b4d91d777e178ce27981d49f7b51f531e12a12b5 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 5 Feb 2015 11:35:59 +0000
Subject: [PATCH] Move ARM usb platform options to arm-generic

---
 config-arm-generic   | 5 +++++
 config-armv7-generic | 2 --
 kernel.spec          | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config-arm-generic b/config-arm-generic
index 783a69039..c47b3e944 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -109,6 +109,11 @@ CONFIG_THERMAL_OF=y
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 
+# USB
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_XHCI_PLATFORM=m
+
 # External Connectors
 CONFIG_EXTCON=m
 CONFIG_EXTCON_GPIO=m
diff --git a/config-armv7-generic b/config-armv7-generic
index c3a3a3cd4..2e9b33324 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -400,8 +400,6 @@ CONFIG_REGMAP_MMIO=m
 CONFIG_REGMAP_IRQ=y
 
 # usb
-CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_EHCI_HCD_PLATFORM=m
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_ULPI=y
 CONFIG_AX88796=m
diff --git a/kernel.spec b/kernel.spec
index df5d102a7..1aa905f1a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2212,6 +2212,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Thu Feb  5 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Move ARM usb platform options to arm-generic
+
 * Thu Feb 05 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc7.git2.1
 - Linux v3.19-rc7-32-g5ee0e962603e