diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-22 12:25:34 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-22 12:25:34 -0800 |
commit | 2af10844eb6ed104f9505bf3a7ba3ceb02264f31 (patch) | |
tree | 8a00024ff525b22379ea90a78ac3222db5a73062 /drivers/usb/core | |
parent | 73bc7d315f56e260071bdb5f15e25b53bddc1402 (diff) | |
parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
download | linux-stable-2af10844eb6ed104f9505bf3a7ba3ceb02264f31.tar.gz linux-stable-2af10844eb6ed104f9505bf3a7ba3ceb02264f31.tar.bz2 linux-stable-2af10844eb6ed104f9505bf3a7ba3ceb02264f31.zip |
USB: Merge 2.6.37-rc5 into usb-next
This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/Kconfig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig index 9eed5b52d9de..bcc24779ba0e 100644 --- a/drivers/usb/core/Kconfig +++ b/drivers/usb/core/Kconfig @@ -107,11 +107,19 @@ config USB_SUSPEND If you are unsure about this, say N here. config USB_OTG - bool + bool "OTG support" depends on USB && EXPERIMENTAL depends on USB_SUSPEND default n - + help + The most notable feature of USB OTG is support for a + "Dual-Role" device, which can act as either a device + or a host. The initial role is decided by the type of + plug inserted and can be changed later when two dual + role devices talk to each other. + + Select this only if your board has Mini-AB/Micro-AB + connector. config USB_OTG_WHITELIST bool "Rely on OTG Targeted Peripherals List" |