Merge branch 'topic/asoc' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / usb / serial / Kconfig

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 70338f4ec9188357f6a5d25716fe666ead6765b1..b361f05cafacaeb2a1af3c38d2652c52a09682e2 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -496,6 +496,14 @@ config USB_SERIAL_SAFE_PADDED
        bool "USB Secure Encapsulated Driver - Padded"
        depends on USB_SERIAL_SAFE
 
+config USB_SERIAL_SIEMENS_MPI
+       tristate "USB Siemens MPI driver"
+       help
+         Say M here if you want to use a Siemens USB/MPI adapter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called siemens_mpi.
+
 config USB_SERIAL_SIERRAWIRELESS
        tristate "USB Sierra Wireless Driver"
        help
@@ -565,6 +573,15 @@ config USB_SERIAL_OMNINET
          To compile this driver as a module, choose M here: the
          module will be called omninet.
 
+config USB_SERIAL_OPTICON
+       tristate "USB Opticon Barcode driver (serial mode)"
+       help
+         Say Y here if you want to use a Opticon USB Barcode device
+         in serial emulation mode.
+
+         To compile this driver as a module, choose M here: the
+         module will be called opticon.
+
 config USB_SERIAL_DEBUG
        tristate "USB Debugging Device"
        help