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 9a7681b55266979521135b403884c4c03f16d82d..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
@@ -507,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.