USB: delete airprime driver

This driver is only for one device id, and the option driver should be
used instead for it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 9a7681b..8878c17 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

diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 17a762a..6047f81 100644 (file)
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -12,7 +12,6 @@ usbserial-obj-$(CONFIG_USB_EZUSB)             += ezusb.o
 usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y)
 
 obj-$(CONFIG_USB_SERIAL_AIRCABLE)              += aircable.o
-obj-$(CONFIG_USB_SERIAL_AIRPRIME)              += airprime.o
 obj-$(CONFIG_USB_SERIAL_ARK3116)               += ark3116.o
 obj-$(CONFIG_USB_SERIAL_BELKIN)                        += belkin_sa.o
 obj-$(CONFIG_USB_SERIAL_CH341)                 += ch341.o

diff --cc drivers/usb/serial/airprime.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge