diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
| commit | 7393423dd9b5790a3115873be355e9fc862bce8f (patch) | |
| tree | fc83214602c8ce41dc06d5c8e21deada679521f7 /drivers/usb/gadget/Kconfig | |
| parent | 8df9676d6402563da91427e8d9f2da8a4598aede (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
| -rw-r--r-- | drivers/usb/gadget/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index c6a8c6b1116a..acc95b2ac6f8 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -284,6 +284,16 @@ config USB_LH7A40X | |||
| 284 | default USB_GADGET | 284 | default USB_GADGET |
| 285 | select USB_GADGET_SELECTED | 285 | select USB_GADGET_SELECTED |
| 286 | 286 | ||
| 287 | # built in ../musb along with host support | ||
| 288 | config USB_GADGET_MUSB_HDRC | ||
| 289 | boolean "Inventra HDRC USB Peripheral (TI, ...)" | ||
| 290 | depends on USB_MUSB_HDRC && (USB_MUSB_PERIPHERAL || USB_MUSB_OTG) | ||
| 291 | select USB_GADGET_DUALSPEED | ||
| 292 | select USB_GADGET_SELECTED | ||
| 293 | help | ||
| 294 | This OTG-capable silicon IP is used in dual designs including | ||
| 295 | the TI DaVinci, OMAP 243x, OMAP 343x, and TUSB 6010. | ||
| 296 | |||
| 287 | config USB_GADGET_OMAP | 297 | config USB_GADGET_OMAP |
| 288 | boolean "OMAP USB Device Controller" | 298 | boolean "OMAP USB Device Controller" |
| 289 | depends on ARCH_OMAP | 299 | depends on ARCH_OMAP |