Merge branch 'master' into csb1725

[mv-sheeva.git] / arch / microblaze / include / asm / prom.h

diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 101fa098f62af7576f05b694a346e80349ae2c2d..bdc38312ae4ae00b677328c1eab1524f3cfd75a8 100644 (file)
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -27,6 +27,7 @@
 
 /* Other Prototypes */
 extern int early_uartlite_console(void);
+extern int early_uart16550_console(void);
 
 #ifdef CONFIG_PCI
 /*