summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2015-02-05 11:35:59 +0000
committerPeter Robinson <pbrobinson@gmail.com>2015-02-05 11:35:59 +0000
commitb4d91d777e178ce27981d49f7b51f531e12a12b5 (patch)
tree2053f71824ab28489e523bd0c715f6fb124bcaa7
parentfcbcdc97c7f21ec1dadc4e628e7d9574ee772613 (diff)
downloadkernel-b4d91d777e178ce27981d49f7b51f531e12a12b5.tar.gz
kernel-b4d91d777e178ce27981d49f7b51f531e12a12b5.tar.xz
kernel-b4d91d777e178ce27981d49f7b51f531e12a12b5.zip
Move ARM usb platform options to arm-generic
-rw-r--r--config-arm-generic5
-rw-r--r--config-armv7-generic2
-rw-r--r--kernel.spec3
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