Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / usb / hso.c

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 9964df199511879b4f5d73c0ca36014da972009e..39422f71e1d06595d76b4ba8cf9353d13c4f3692 100644 (file)
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -211,7 +211,7 @@ struct hso_serial_state_notification {
        u16 wIndex;
        u16 wLength;
        u16 UART_state_bitmap;
-} __attribute__((packed));
+} __packed;
 
 struct hso_tiocmget {
        struct mutex mutex;
@@ -475,6 +475,9 @@ static const struct usb_device_id hso_ids[] = {
        {USB_DEVICE(0x0af0, 0x8302)},
        {USB_DEVICE(0x0af0, 0x8304)},
        {USB_DEVICE(0x0af0, 0x8400)},
+       {USB_DEVICE(0x0af0, 0x8600)},
+       {USB_DEVICE(0x0af0, 0x8800)},
+       {USB_DEVICE(0x0af0, 0x8900)},
        {USB_DEVICE(0x0af0, 0xd035)},
        {USB_DEVICE(0x0af0, 0xd055)},
        {USB_DEVICE(0x0af0, 0xd155)},
@@ -1331,7 +1334,6 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
        /* check for port already opened, if not set the termios */
        serial->open_count++;
        if (serial->open_count == 1) {
-               tty->low_latency = 1;
                serial->rx_state = RX_IDLE;
                /* Force default termio settings */
                _hso_serial_set_termios(tty, NULL);