diff options
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
-rw-r--r-- | drivers/usb/gadget/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 5dda2dc708db..80a7c02dc951 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig | |||
@@ -576,19 +576,23 @@ config USB_FILE_STORAGE_TEST | |||
576 | normal operation. | 576 | normal operation. |
577 | 577 | ||
578 | config USB_G_SERIAL | 578 | config USB_G_SERIAL |
579 | tristate "Serial Gadget (with CDC ACM support)" | 579 | tristate "Serial Gadget (with CDC ACM and CDC OBEX support)" |
580 | help | 580 | help |
581 | The Serial Gadget talks to the Linux-USB generic serial driver. | 581 | The Serial Gadget talks to the Linux-USB generic serial driver. |
582 | This driver supports a CDC-ACM module option, which can be used | 582 | This driver supports a CDC-ACM module option, which can be used |
583 | to interoperate with MS-Windows hosts or with the Linux-USB | 583 | to interoperate with MS-Windows hosts or with the Linux-USB |
584 | "cdc-acm" driver. | 584 | "cdc-acm" driver. |
585 | 585 | ||
586 | This driver also supports a CDC-OBEX option. You will need a | ||
587 | user space OBEX server talking to /dev/ttyGS*, since the kernel | ||
588 | itself doesn't implement the OBEX protocol. | ||
589 | |||
586 | Say "y" to link the driver statically, or "m" to build a | 590 | Say "y" to link the driver statically, or "m" to build a |
587 | dynamically linked module called "g_serial". | 591 | dynamically linked module called "g_serial". |
588 | 592 | ||
589 | For more information, see Documentation/usb/gadget_serial.txt | 593 | For more information, see Documentation/usb/gadget_serial.txt |
590 | which includes instructions and a "driver info file" needed to | 594 | which includes instructions and a "driver info file" needed to |
591 | make MS-Windows work with this driver. | 595 | make MS-Windows work with CDC ACM. |
592 | 596 | ||
593 | config USB_MIDI_GADGET | 597 | config USB_MIDI_GADGET |
594 | tristate "MIDI Gadget (EXPERIMENTAL)" | 598 | tristate "MIDI Gadget (EXPERIMENTAL)" |