lis3: add support for HP EliteBook 8540w

[~andy/linux] / drivers / usb / gadget / Kconfig

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index a60b472a0b39c126085106c349e066f7ee3bfdb6..b21cd376c11af5978095c97f49bdee67aa1ec6d0 100644 (file)
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -873,6 +873,16 @@ config USB_G_NOKIA
          It's only really useful for N900 hardware. If you're building
          a kernel for N900, say Y or M here. If unsure, say N.
 
+config USB_G_ACM_MS
+       tristate "CDC Composite Device (ACM and mass storage)"
+       depends on BLOCK
+       help
+         This driver provides two functions in one configuration:
+         a mass storage, and a CDC ACM (serial port) link.
+
+         Say "y" to link the driver statically, or "m" to build a
+         dynamically linked module called "g_acm_ms".
+
 config USB_G_MULTI
        tristate "Multifunction Composite Gadget (EXPERIMENTAL)"
        depends on BLOCK && NET