Skip to content

Commit 640c1bc

Browse files
committed
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 <[email protected]>
1 parent 518386c commit 640c1bc

File tree

4 files changed

+2
-362
lines changed

4 files changed

+2
-362
lines changed

drivers/usb/serial/Kconfig

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@ config USB_SERIAL_AIRCABLE
6464
To compile this driver as a module, choose M here: the module
6565
will be called aircable.
6666

67-
config USB_SERIAL_AIRPRIME
68-
tristate "USB AirPrime CDMA Wireless Driver"
69-
help
70-
Say Y here if you want to use a AirPrime CDMA Wireless PC card.
71-
72-
To compile this driver as a module, choose M here: the
73-
module will be called airprime.
74-
7567
config USB_SERIAL_ARK3116
7668
tristate "USB ARK Micro 3116 USB Serial Driver"
7769
help

drivers/usb/serial/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ usbserial-obj-$(CONFIG_USB_EZUSB) += ezusb.o
1212
usbserial-objs := usb-serial.o generic.o bus.o $(usbserial-obj-y)
1313

1414
obj-$(CONFIG_USB_SERIAL_AIRCABLE) += aircable.o
15-
obj-$(CONFIG_USB_SERIAL_AIRPRIME) += airprime.o
1615
obj-$(CONFIG_USB_SERIAL_ARK3116) += ark3116.o
1716
obj-$(CONFIG_USB_SERIAL_BELKIN) += belkin_sa.o
1817
obj-$(CONFIG_USB_SERIAL_CH341) += ch341.o

drivers/usb/serial/airprime.c

Lines changed: 0 additions & 353 deletions
This file was deleted.

drivers/usb/serial/option.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ static int option_send_setup(struct usb_serial_port *port);
173173
#define DELL_VENDOR_ID 0x413C
174174

175175
#define KYOCERA_VENDOR_ID 0x0c88
176+
#define KYOCERA_PRODUCT_KPC650 0x17da
176177
#define KYOCERA_PRODUCT_KPC680 0x180a
177178

178179
#define ANYDATA_VENDOR_ID 0x16d5
@@ -305,6 +306,7 @@ static struct usb_device_id option_ids[] = {
305306
{ USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) },
306307
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
307308
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
309+
{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC650) },
308310
{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
309311
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */
310312
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */

0 commit comments

Comments
 (0)