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

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/mips/bcm63xx/early_printk.c b/arch/mips/bcm63xx/early_printk.c
index bf353c937df2..aa8f7f9cc7a4 100644
--- 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);