Merge branch 'linus' into core/urgent

[linux-2.6-omap-h63xx.git] / arch / mips / emma2rh / common / prom.c

diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 5e92b3a9c5b894227ffe91c0b78351650c1d3a2a..e14a2e3d8842e0a2704fb4a548a12b522cf15c49 100644 (file)
--- a/arch/mips/emma2rh/common/prom.c
+++ b/arch/mips/emma2rh/common/prom.c
@@ -30,7 +30,6 @@
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
 #include <asm/emma2rh/emma2rh.h>
-#include <asm/debug.h>
 
 const char *get_system_type(void)
 {