Merge branch 'misc' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc...

[pandora-kernel.git] / drivers / usb / serial / Kconfig

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 7b5e8e4..f96b73f 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -62,6 +62,15 @@ config USB_SERIAL_AIRPRIME
          To compile this driver as a module, choose M here: the
          module will be called airprime.
 
+config USB_SERIAL_ANYDATA
+       tristate "USB AnyData CDMA Wireless Driver"
+       depends on USB_SERIAL
+       help
+         Say Y here if you want to use a AnyData CDMA device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called anydata.
+
 config USB_SERIAL_BELKIN
        tristate "USB Belkin and Peracom Single Port Serial Driver"
        depends on USB_SERIAL
@@ -75,7 +84,7 @@ config USB_SERIAL_BELKIN
 
 config USB_SERIAL_WHITEHEAT
        tristate "USB ConnectTech WhiteHEAT Serial Driver"
-       depends on USB_SERIAL && BROKEN_ON_SMP
+       depends on USB_SERIAL
        help
          Say Y here if you want to use a ConnectTech WhiteHEAT 4 port
          USB to serial converter device.
@@ -149,6 +158,15 @@ config USB_SERIAL_FTDI_SIO
          To compile this driver as a module, choose M here: the
          module will be called ftdi_sio.
 
+config USB_SERIAL_FUNSOFT
+       tristate "USB Fundamental Software Dongle Driver"
+       depends on USB_SERIAL
+       ---help---
+         Say Y here if you want to use the Fundamental Software dongle.
+
+         To compile this driver as a module, choose M here: the
+         module will be called funsoft.
+
 config USB_SERIAL_VISOR
        tristate "USB Handspring Visor / Palm m50x / Sony Clie Driver"
        depends on USB_SERIAL
@@ -394,14 +412,12 @@ config USB_SERIAL_MCT_U232
          To compile this driver as a module, choose M here: the
          module will be called mct_u232.
 
-config USB_SERIAL_NOKIA_DKU2
-       tristate "USB Nokia DKU2 Driver"
+config USB_SERIAL_NAVMAN
+       tristate "USB Navman GPS device"
        depends on USB_SERIAL
        help
-         Say Y here if you want to use a Nokia DKU2 device.
-
          To compile this driver as a module, choose M here: the
-         module will be called nokia_dku2.
+         module will be called navman.
 
 config USB_SERIAL_PL2303
        tristate "USB Prolific 2303 Single Port Serial Driver"