diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /drivers/usb/gadget/Kconfig | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
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 ee411206c699..7460cd797f45 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
| @@ -812,6 +812,16 @@ config USB_CDC_COMPOSITE | |||
| 812 | Say "y" to link the driver statically, or "m" to build a | 812 | Say "y" to link the driver statically, or "m" to build a |
| 813 | dynamically linked module. | 813 | dynamically linked module. |
| 814 | 814 | ||
| 815 | config USB_G_NOKIA | ||
| 816 | tristate "Nokia composite gadget" | ||
| 817 | depends on PHONET | ||
| 818 | help | ||
| 819 | The Nokia composite gadget provides support for acm, obex | ||
| 820 | and phonet in only one composite gadget driver. | ||
| 821 | |||
| 822 | It's only really useful for N900 hardware. If you're building | ||
| 823 | a kernel for N900, say Y or M here. If unsure, say N. | ||
| 824 | |||
| 815 | config USB_G_MULTI | 825 | config USB_G_MULTI |
| 816 | tristate "Multifunction Composite Gadget (EXPERIMENTAL)" | 826 | tristate "Multifunction Composite Gadget (EXPERIMENTAL)" |
| 817 | depends on BLOCK && NET | 827 | depends on BLOCK && NET |