Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / host / Kconfig

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index a134350b6429aa294732869ebb9e1641d897ede9..c7d83751793c499a03fb324a4c4c49f9bd239bf4 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -88,10 +88,9 @@ config USB_EHCI_BIG_ENDIAN_DESC
        default y
 
 config USB_EHCI_FSL
-       bool
-       depends on USB_EHCI_HCD
+       bool "Support for Freescale on-chip EHCI USB controller"
+       depends on USB_EHCI_HCD && FSL_SOC
        select USB_EHCI_ROOT_HUB_TT
-       default y if MPC834x || PPC_MPC831x
        ---help---
          Variation of ARC USB block used in some Freescale chips.