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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 201f6096844..1b5633f4698 100644
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -116,7 +116,7 @@ static void opticon_read_bulk_callback(struct urb *urb)
                 } else {
                         if ((data[0] == 0x00) && (data[1] == 0x01)) {
                                 spin_lock_irqsave(&priv->lock, flags);
-                                /* CTS status infomation package */
+                                /* CTS status information package */
                                 if (data[2] == 0x00)
                                         priv->cts = false;
                                 else
@@ -413,7 +413,7 @@ static int opticon_tiocmget(struct tty_struct *tty)
         return result;
 }
 
-static int opticon_tiocmset(struct tty_struct *tty, struct file *file,
+static int opticon_tiocmset(struct tty_struct *tty,
                            unsigned int set, unsigned int clear)
 {
         struct usb_serial_port *port = tty->driver_data;