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/bcm63xx/early_printk.c
+++ b/arch/mips/bcm63xx/early_printk.c
@@ -10,7 +10,7 @@
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>

-static void __init wait_xfered(void)
+static void wait_xfered(void)
 {
 	unsigned int val;

@@ -22,7 +22,7 @@ static void __init wait_xfered(void)
 	} while (1);
 }

-void __init prom_putchar(char c)
+void prom_putchar(char c)
 {
 	wait_xfered();
 	bcm_uart0_writel(c, UART_FIFO_REG);