--- drivers/usb/serial/cp210x.c

+++ drivers/usb/serial/cp210x.c

@@ -51,7 +51,6 @@ static void cp210x_break_ctl(struct tty_

static int cp210x_startup(struct usb_serial *);

static void cp210x_disconnect(struct usb_serial *);

static void cp210x_dtr_rts(struct usb_serial_port *p, int on);

-static int cp210x_carrier_raised(struct usb_serial_port *p);

static int debug;

@@ -88,7 +87,6 @@ static struct usb_device_id id_table []

{ USB_DEVICE(0x10C4, 0x8115) }, /* Arygon NFC/Mifare Reader */

{ USB_DEVICE(0x10C4, 0x813D) }, /* Burnside Telecom Deskmobile */

{ USB_DEVICE(0x10C4, 0x813F) }, /* Tams Master Easy Control */

- { USB_DEVICE(0x10C4, 0x8149) }, /* West Mountain Radio Computerized Battery Analyzer */

{ USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */

{ USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */

{ USB_DEVICE(0x10C4, 0x8156) }, /* B&G H3000 link cable */

@@ -111,7 +109,9 @@ static struct usb_device_id id_table []

{ USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */

{ USB_DEVICE(0x10C4, 0x8382) }, /* Cygnal Integrated Products, Inc. */

{ USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */

+ { USB_DEVICE(0x10C4, 0x83D8) }, /* DekTec DTA Plus VHF/UHF Booster/Attenuator */

{ USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */

+ { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/GPRS Modem */

{ USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */

{ USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */

{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */

@@ -165,8 +165,7 @@ static struct usb_serial_driver cp210x_d

.tiocmset = cp210x_tiocmset,

.attach = cp210x_startup,

.disconnect = cp210x_disconnect,

- .dtr_rts = cp210x_dtr_rts,

- .carrier_raised = cp210x_carrier_raised

+ .dtr_rts = cp210x_dtr_rts

};

/* Config request types */

@@ -800,15 +799,6 @@ static int cp210x_tiocmget (struct tty_s

return result;

}

-static int cp210x_carrier_raised(struct usb_serial_port *p)

-{

- unsigned int control;

- cp210x_get_config(p, CP210X_GET_MDMSTS, &control, 1);

- if (control & CONTROL_DCD)

- return 1;

- return 0;

-}

-

static void cp210x_break_ctl (struct tty_struct *tty, int break_state)

{

struct usb_serial_port *port = tty->driver_data;