drm: merge in Linus mainline

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / xmon.h

diff --git a/include/asm-powerpc/xmon.h b/include/asm-powerpc/xmon.h
index ace2072d4a833fd331ded2e13be7cf7bd1d8a556..43f7129984c723312c3ca394ccf32fe53d52a4e8 100644 (file)
--- a/include/asm-powerpc/xmon.h
+++ b/include/asm-powerpc/xmon.h
@@ -7,7 +7,6 @@ struct pt_regs;
 extern int xmon(struct pt_regs *excp);
 extern void xmon_printf(const char *fmt, ...);
 extern void xmon_init(int);
-extern void xmon_map_scc(void);
 
 #endif
 #endif