diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /drivers/usb/host/Kconfig | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'drivers/usb/host/Kconfig')
| -rw-r--r-- | drivers/usb/host/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 2391c396ca32..6f4f8e6a40c7 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
| @@ -122,7 +122,7 @@ config USB_EHCI_FSL | |||
| 122 | bool "Support for Freescale on-chip EHCI USB controller" | 122 | bool "Support for Freescale on-chip EHCI USB controller" |
| 123 | depends on USB_EHCI_HCD && FSL_SOC | 123 | depends on USB_EHCI_HCD && FSL_SOC |
| 124 | select USB_EHCI_ROOT_HUB_TT | 124 | select USB_EHCI_ROOT_HUB_TT |
| 125 | select USB_FSL_MPH_DR_OF | 125 | select USB_FSL_MPH_DR_OF if OF |
| 126 | ---help--- | 126 | ---help--- |
| 127 | Variation of ARC USB block used in some Freescale chips. | 127 | Variation of ARC USB block used in some Freescale chips. |
| 128 | 128 | ||