Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 2cffec85ee7e6581d95f14971a2afc7fe1eadbce..70338f4ec9188357f6a5d25716fe666ead6765b1 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -64,14 +64,6 @@ config USB_SERIAL_AIRCABLE
            To compile this driver as a module, choose M here: the module
            will be called aircable.
 
-config USB_SERIAL_AIRPRIME
-       tristate "USB AirPrime CDMA Wireless Driver"
-       help
-         Say Y here if you want to use a AirPrime CDMA Wireless PC card.
-
-         To compile this driver as a module, choose M here: the
-         module will be called airprime.
-
 config USB_SERIAL_ARK3116
        tristate "USB ARK Micro 3116 USB Serial Driver"
        help
@@ -304,19 +296,19 @@ config USB_SERIAL_KEYSPAN
 
 config USB_SERIAL_KEYSPAN_MPR
        bool "USB Keyspan MPR Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the Keyspan MPR converter.
 
 config USB_SERIAL_KEYSPAN_USA28
        bool "USB Keyspan USA-28 Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-28 converter.
 
 config USB_SERIAL_KEYSPAN_USA28X
        bool "USB Keyspan USA-28X Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-28X converter.
          Be sure you have a USA-28X, there are also 28XA and 28XB
@@ -324,7 +316,7 @@ config USB_SERIAL_KEYSPAN_USA28X
 
 config USB_SERIAL_KEYSPAN_USA28XA
        bool "USB Keyspan USA-28XA Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-28XA converter.
          Be sure you have a USA-28XA, there are also 28X and 28XB
@@ -332,7 +324,7 @@ config USB_SERIAL_KEYSPAN_USA28XA
 
 config USB_SERIAL_KEYSPAN_USA28XB
        bool "USB Keyspan USA-28XB Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-28XB converter.
          Be sure you have a USA-28XB, there are also 28X and 28XA
@@ -340,43 +332,43 @@ config USB_SERIAL_KEYSPAN_USA28XB
 
 config USB_SERIAL_KEYSPAN_USA19
        bool "USB Keyspan USA-19 Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-19 converter.
 
 config USB_SERIAL_KEYSPAN_USA18X
        bool "USB Keyspan USA-18X Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-18X converter.
 
 config USB_SERIAL_KEYSPAN_USA19W
        bool "USB Keyspan USA-19W Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-19W converter.
 
 config USB_SERIAL_KEYSPAN_USA19QW
        bool "USB Keyspan USA-19QW Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-19QW converter.
 
 config USB_SERIAL_KEYSPAN_USA19QI
        bool "USB Keyspan USA-19QI Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-19QI converter.
 
 config USB_SERIAL_KEYSPAN_USA49W
        bool "USB Keyspan USA-49W Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-49W converter.
 
 config USB_SERIAL_KEYSPAN_USA49WLC
        bool "USB Keyspan USA-49WLC Firmware"
-       depends on USB_SERIAL_KEYSPAN
+       depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL
        help
          Say Y here to include firmware for the USA-49WLC converter.
 
@@ -447,6 +439,15 @@ config USB_SERIAL_MOS7840
          To compile this driver as a module, choose M here: the
          module will be called mos7840.  If unsure, choose N.
 
+config USB_SERIAL_MOTOROLA
+       tristate "USB Motorola Phone modem driver"
+       ---help---
+         Say Y here if you want to use a Motorola phone with a USB
+         connector as a modem link.
+
+         To compile this driver as a module, choose M here: the
+         module will be called moto_modem.  If unsure, choose N.
+
 config USB_SERIAL_NAVMAN
        tristate "USB Navman GPS device"
        help
@@ -498,9 +499,10 @@ config USB_SERIAL_SAFE_PADDED
 config USB_SERIAL_SIERRAWIRELESS
        tristate "USB Sierra Wireless Driver"
        help
-         Say M here if you want to use a Sierra Wireless device (if
-         using an PC 5220 or AC580 please use the Airprime driver
-         instead).
+         Say M here if you want to use Sierra Wireless devices.
+
+         Many deviecs have a feature known as TRU-Install, for those devices
+         to work properly the USB Storage Sierra feature must be enabled.
 
          To compile this driver as a module, choose M here: the
          module will be called sierra.