Merge branch 'cris_debug_port_fix' into cris

diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 162730eb887ba96ac7d919f286961f14231a5ede..3dc6e91ba39e275a7005a36ec27a54893dad0eb9 100644 (file)
--- a/arch/cris/arch-v10/kernel/debugport.c
+++ b/arch/cris/arch-v10/kernel/debugport.c
@@ -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