merge Linus head tree into my drm tree and fix up conflicts

[powerpc.git] / arch / sparc64 / prom / console.c

diff --git a/arch/sparc64/prom/console.c b/arch/sparc64/prom/console.c
index 028a53f..eae5db8 100644 (file)
--- a/arch/sparc64/prom/console.c
+++ b/arch/sparc64/prom/console.c
@@ -67,7 +67,7 @@ prom_putchar(char c)
 }
 
 void
-prom_puts(char *s, int len)
+prom_puts(const char *s, int len)
 {
        p1275_cmd("write", P1275_ARG(1,P1275_ARG_IN_BUF)|
                           P1275_INOUT(3,1),