diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:21 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:21 -0500 |
| commit | 38a5d6736e7f714cc56d58692001e66dcbb98799 (patch) | |
| tree | 337d32375e10b04642013710c2c424514474b32c /drivers/usb/gadget/Kconfig | |
| parent | 0bfd95a2a104dfc2469d68de52df99939371c0d4 (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
Merge commit 'v2.6.38-rc6' into devicetree/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 06bb9d4587e9..d50099675f28 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -546,6 +546,8 @@ config USB_GADGET_CI13XXX_MSM | |||
| 546 | ci13xxx_udc core. | 546 | ci13xxx_udc core. |
| 547 | This driver depends on OTG driver for PHY initialization, | 547 | This driver depends on OTG driver for PHY initialization, |
| 548 | clock management, powering up VBUS, and power management. | 548 | clock management, powering up VBUS, and power management. |
| 549 | This driver is not supported on boards like trout which | ||
| 550 | has an external PHY. | ||
| 549 | 551 | ||
| 550 | Say "y" to link the driver statically, or "m" to build a | 552 | Say "y" to link the driver statically, or "m" to build a |
| 551 | dynamically linked module called "ci13xxx_msm" and force all | 553 | dynamically linked module called "ci13xxx_msm" and force all |