Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / powerpc / platforms / powermac / udbg_scc.c

diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c
index df6dec4..c4352a8 100644 (file)
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -47,14 +47,14 @@ static int udbg_scc_getc_poll(void)
        return -1;
 }
 
-static char udbg_scc_getc(void)
+static int udbg_scc_getc(void)
 {
        if (sccc) {
                while ((in_8(sccc) & SCC_RXRDY) == 0)
                        ;
                return in_8(sccd);
        }
-       return 0;
+       return -1;
 }
 
 static unsigned char scc_inittab[] = {
@@ -153,7 +153,7 @@ static void udbg_real_scc_putc(char c)
                udbg_real_scc_putc('\r');
 }
 
-void udbg_init_pmac_realmode(void)
+void __init udbg_init_pmac_realmode(void)
 {
        sccc = (volatile u8 __iomem *)0x80013020ul;
        sccd = (volatile u8 __iomem *)0x80013030ul;