Merge branch 'upstream/wm8350' into for-2.6.32

[pandora-kernel.git] / drivers / usb / serial / ipaq.c

diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 2545d45..24fcc64 100644 (file)
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -75,7 +75,7 @@ static int initial_wait;
 
 /* Function prototypes for an ipaq */
 static int  ipaq_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp);
+                       struct usb_serial_port *port);
 static void ipaq_close(struct usb_serial_port *port);
 static int  ipaq_calc_num_ports(struct usb_serial *serial);
 static int  ipaq_startup(struct usb_serial *serial);
@@ -587,7 +587,7 @@ static int          bytes_in;
 static int             bytes_out;
 
 static int ipaq_open(struct tty_struct *tty,
-                       struct usb_serial_port *port, struct file *filp)
+                       struct usb_serial_port *port)
 {
        struct usb_serial       *serial = port->serial;
        struct ipaq_private     *priv;
@@ -628,11 +628,6 @@ static int ipaq_open(struct tty_struct *tty,
                priv->free_len += PACKET_SIZE;
        }
 
-       if (tty) {
-               /* FIXME: These two are bogus */
-               tty->raw = 1;
-               tty->real_raw = 1;
-       }
        /*
         * Lose the small buffers usbserial provides. Make larger ones.
         */