Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / serial / crisv10.c

diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 211c21797ce016ef8646a8c04a32f5affd35ed17..e642c22c80e230f8ad5da30a69b9512838cc34b9 100644 (file)
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -34,14 +34,14 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <asm/system.h>
 #include <linux/delay.h>
 
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 
 /* non-arch dependent serial structures are in linux/serial.h */
 #include <linux/serial.h>
 /* while we keep our own stuff (struct e100_serial) in a local .h file */
 #include "crisv10.h"
 #include <asm/fasttimer.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 
 #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
 #ifndef CONFIG_ETRAX_FAST_TIMER
@@ -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) {