diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /drivers/usb/otg/Kconfig | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/usb/otg/Kconfig')
| -rw-r--r-- | drivers/usb/otg/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index 9fb875d5f09c..9ffc8237fb4b 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig | |||
| @@ -103,6 +103,8 @@ config USB_MSM_OTG_72K | |||
| 103 | required after resetting the hardware and power management. | 103 | required after resetting the hardware and power management. |
| 104 | This driver is required even for peripheral only or host only | 104 | This driver is required even for peripheral only or host only |
| 105 | mode configurations. | 105 | mode configurations. |
| 106 | This driver is not supported on boards like trout which | ||
| 107 | has an external PHY. | ||
| 106 | 108 | ||
| 107 | config AB8500_USB | 109 | config AB8500_USB |
| 108 | tristate "AB8500 USB Transceiver Driver" | 110 | tristate "AB8500 USB Transceiver Driver" |