Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next

2013-02-21 12:51:33 +01:00
parent 612663a974 535237ceca
commit 8bfc245f9a
300 changed files with 5451 additions and 1968 deletions
--- a/arch/mips/loongson1/common/prom.c
+++ b/arch/mips/loongson1/common/prom.c
@@ -73,7 +73,7 @@ void __init prom_free_prom_memory(void)

 #define PORT(offset)	(u8 *)(KSEG1ADDR(LS1X_UART0_BASE + offset))

-void __init prom_putchar(char c)
+void prom_putchar(char c)
 {
 	int timeout;