From b597cbbbef51734e0c9f55dece782a0df19678f3 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 5 May 2014 22:49:15 +0100 Subject: Fix some USB on ARM LPAE kernels --- config-armv7 | 1 - config-armv7-generic | 2 ++ kernel.spec | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config-armv7 b/config-armv7 index 2ceb44122..4e7662ebe 100644 --- a/config-armv7 +++ b/config-armv7 @@ -138,7 +138,6 @@ CONFIG_REGULATOR_TWL4030=y CONFIG_BACKLIGHT_PANDORA=m CONFIG_OMAP_OCP2SCP=m CONFIG_USB_EHCI_HCD_OMAP=m -CONFIG_USB_OHCI_HCD_PLATFORM=m CONFIG_USB_OHCI_HCD_OMAP3=m CONFIG_USB_MUSB_AM35X=m CONFIG_USB_MUSB_OMAP2PLUS=m diff --git a/config-armv7-generic b/config-armv7-generic index 4e6fca7b3..3dff08f64 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -190,6 +190,8 @@ CONFIG_ARM_CPU_SUSPEND=y CONFIG_GENERIC_CPUFREQ_CPU0=m # usb +CONFIG_USB_OHCI_HCD_PLATFORM=m +CONFIG_USB_EHCI_HCD_PLATFORM=m CONFIG_USB_OTG=y # CONFIG_USB_OTG_WHITELIST is not set # CONFIG_USB_OTG_BLACKLIST_HUB is not set diff --git a/kernel.spec b/kernel.spec index 12315ddf8..c9dcdb0f4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2225,6 +2225,9 @@ fi # ||----w | # || || %changelog +* Mon May 5 2014 Peter Robinson +- Fix some USB on ARM LPAE kernels + * Mon May 05 2014 Josh Boyer - 3.15.0-0.rc4.git0.1 - Linux v3.15-rc4 - Disable debugging options. -- cgit