[PATCH] ocfs2: fix oops in mmap_truncate testing

[pandora-kernel.git] / arch / ppc / boot / simple / mv64x60_tty.c

diff --git a/arch/ppc/boot/simple/mv64x60_tty.c b/arch/ppc/boot/simple/mv64x60_tty.c
index 0c52f5c..8a73578 100644 (file)
--- a/arch/ppc/boot/simple/mv64x60_tty.c
+++ b/arch/ppc/boot/simple/mv64x60_tty.c
@@ -12,7 +12,6 @@
 
 /* This code assumes that the data cache has been disabled (L1, L2, L3). */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/serial_reg.h>
 #include <asm/serial.h>
@@ -339,7 +338,7 @@ serial_tstc(unsigned long com_port)
 
        rdp = &rd[com_port][cur_rd[com_port]];
 
-       /* Go thru rcv desc's until empty looking for one with data (no error)*/
+       /* Go through rcv descs until empty looking for one with data (no error)*/
        while (((rdp->cmd_stat & SDMA_DESC_CMDSTAT_O) == 0) &&
                (loop_count++ < RX_NUM_DESC)) {