diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /drivers/usb/serial/Kconfig | |
parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/serial/Kconfig')
-rw-r--r-- | drivers/usb/serial/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index 8bd44fda5eaf..ac33bd47cfce 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -456,6 +456,17 @@ config USB_SERIAL_SAFE_PADDED | |||
456 | bool "USB Secure Encapsulated Driver - Padded" | 456 | bool "USB Secure Encapsulated Driver - Padded" |
457 | depends on USB_SERIAL_SAFE | 457 | depends on USB_SERIAL_SAFE |
458 | 458 | ||
459 | config USB_SERIAL_SIERRAWIRELESS | ||
460 | tristate "USB Sierra Wireless Driver" | ||
461 | depends on USB_SERIAL | ||
462 | help | ||
463 | Say M here if you want to use a Sierra Wireless device (if | ||
464 | using an PC 5220 or AC580 please use the Airprime driver | ||
465 | instead). | ||
466 | |||
467 | To compile this driver as a module, choose M here: the | ||
468 | module will be called sierra. | ||
469 | |||
459 | config USB_SERIAL_TI | 470 | config USB_SERIAL_TI |
460 | tristate "USB TI 3410/5052 Serial Driver" | 471 | tristate "USB TI 3410/5052 Serial Driver" |
461 | depends on USB_SERIAL | 472 | depends on USB_SERIAL |