Merge branch 'for-next' into for-linus

[safe/jmp/linux-2.6] / drivers / char / serial167.c

diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 986aa60..1ec3d5c 100644 (file)
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -1989,7 +1989,7 @@ void mvme167_serial_console_setup(int cflag)
        /*
         * Attempt to set up all channels to something reasonable, and
         * bang out a INIT_CHAN command.  We should then be able to limit
-        * the ammount of fiddling we have to do in normal running.
+        * the amount of fiddling we have to do in normal running.
         */
 
        for (ch = 3; ch >= 0; ch--) {