diff --git a/config-armv7 b/config-armv7
index 834fe21c9..4aaa913a6 100644
--- a/config-armv7
+++ b/config-armv7
@@ -60,6 +60,7 @@ CONFIG_DRM_ARMADA=m
 CONFIG_ORION_WATCHDOG=m
 CONFIG_SND_KIRKWOOD_SOC=m
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
+CONFIG_USB_EHCI_HCD_ORION=m
 # CONFIG_CACHE_FEROCEON_L2 is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
diff --git a/config-armv7-generic b/config-armv7-generic
index ffd7ba0b4..1b6bea7ad 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -201,7 +201,6 @@ CONFIG_USB_ULPI=y
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_USB_ISP1760_HCD=m
-# CONFIG_USB_EHCI_HCD_ORION is not set
 
 # usb gadget 
 CONFIG_USB_GADGET=m
diff --git a/kernel.spec b/kernel.spec
index 7cd352505..de89db058 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2274,6 +2274,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Mon Jun  9 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable USB_EHCI_HCD_ORION to fix USB on Marvell (fix boot for some devices)
+
 * Fri Jun 06 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc8.git4.1
 - CVE-2014-3940 missing check during hugepage migration (rhbz 1104097 1105042)
 - Linux v3.15-rc8-81-g951e273060d1