--- drivers/usb/serial/keyspan_pda.c

+++ drivers/usb/serial/keyspan_pda.c

@@ -663,22 +663,6 @@ static void keyspan_pda_dtr_rts(struct u

}

}

-static int keyspan_pda_carrier_raised(struct usb_serial_port *port)

-{

- struct usb_serial *serial = port->serial;

- unsigned char modembits;

-

- /* If we can read the modem status and the DCD is low then

- carrier is not raised yet */

- if (keyspan_pda_get_modem_info(serial, &modembits) >= 0) {

- if (!(modembits & (1>>6)))

- return 0;

- }

- /* Carrier raised, or we failed (eg disconnected) so

- progress accordingly */

- return 1;

-}

-

static int keyspan_pda_open(struct tty_struct *tty,

struct usb_serial_port *port)

@@ -854,7 +838,6 @@ static struct usb_serial_driver keyspan_

.id_table = id_table_std,

.num_ports = 1,

.dtr_rts = keyspan_pda_dtr_rts,

- .carrier_raised = keyspan_pda_carrier_raised,

.open = keyspan_pda_open,

.close = keyspan_pda_close,

.write = keyspan_pda_write,