Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-flexiantxendom0-3.2.10.git] / drivers / usb / serial / Kconfig

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index b71e309..c2b2976 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -527,6 +527,15 @@ config USB_SERIAL_SAFE_PADDED
        bool "USB Secure Encapsulated Driver - Padded"
        depends on USB_SERIAL_SAFE
 
+config USB_SERIAL_SAMBA
+       tristate "USB Atmel SAM Boot Assistant (SAM-BA) driver"
+       help
+         Say Y here if you want to access the SAM-BA boot application of an
+         Atmel AT91SAM device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sam-ba.
+
 config USB_SERIAL_SIEMENS_MPI
        tristate "USB Siemens MPI driver"
        help