Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[linux-2.6-block.git] / drivers / serial / crisv10.c

diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 8b2c619a09f2f05efb586552567e3b94d637fa72..e642c22c80e230f8ad5da30a69b9512838cc34b9 100644 (file)
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -1203,7 +1203,7 @@ static void e100_disable_txdma_channel(struct e100_serial *info)
        unsigned long flags;
 
        /* Disable output DMA channel for the serial port in question
-        * ( set to something other then serialX)
+        * ( set to something other than serialX)
         */
        local_irq_save(flags);
        DFLOW(DEBUG_LOG(info->line, "disable_txdma_channel %i\n", info->line));
@@ -1266,7 +1266,7 @@ static void e100_disable_rxdma_channel(struct e100_serial *info)
        unsigned long flags;
 
        /* Disable input DMA channel for the serial port in question
-        * ( set to something other then serialX)
+        * ( set to something other than serialX)
         */
        local_irq_save(flags);
        if (info->line == 0) {