Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / drivers / usb / serial / cypress_m8.c

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index baf74b4..e23c779 100644 (file)
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -152,7 +152,7 @@ struct cypress_private {
        int isthrottled;                   /* if throttled, discard reads */
        wait_queue_head_t delta_msr_wait;  /* used for TIOCMIWAIT */
        char prev_status, diff_status;     /* used for TIOCMIWAIT */
-       /* we pass a pointer to this as the arguement sent to
+       /* we pass a pointer to this as the argument sent to
           cypress_set_termios old_termios */
        struct ktermios tmp_termios;       /* stores the old termios settings */
 };