Merge davem@master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev

[linux-2.6-omap-h63xx.git] / arch / mips / cobalt / console.c

diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index ca56b415b8ac30c3e6b45a7c02767a9226e12ce1..0485d51f72165169190bd1895526581fd4eb35c5 100644 (file)
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,13 +1,11 @@
 /*
  * (C) P. Horton 2006
  */
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/console.h>
 #include <linux/serial_reg.h>
+
 #include <asm/addrspace.h>
-#include <asm/mach-cobalt/cobalt.h>
+
+#include <cobalt.h>
 
 void prom_putchar(char c)
 {