Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / cris / arch-v10 / kernel / debugport.c

diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 162730eb887ba96ac7d919f286961f14231a5ede..99851ba8e5fa317cd0b2e8f8510e549683e30ebd 100644 (file)
--- a/arch/cris/arch-v10/kernel/debugport.c
+++ b/arch/cris/arch-v10/kernel/debugport.c
@@ -19,7 +19,7 @@
 #include <linux/delay.h>
 #include <linux/tty.h>
 #include <asm/system.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 #include <asm/io.h>             /* Get SIMCOUT. */
 
 extern void reset_watchdog(void);
@@ -432,10 +432,10 @@ static int dummy_write_room(struct tty_struct *tty)
 }
 
 static const struct tty_operations dummy_ops = {
-        .open = dummy_open,
-        .close = dummy_close,
-        .write = dummy_write,
-        .write_room = dummy_write_room,
+       .open = dummy_open,
+       .close = dummy_close,
+       .write = dummy_write,
+       .write_room = dummy_write_room,
 };
 
 void __init