sparc: Use sparc64 version of prom/printf.c

Use sparc64 version of prom/printf.c. The only differences for sparc32 is that prom_printf is no longer exported for modules which should be OK. Signed-off-by: Robert Reif <reif@earthlink.net> Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Dec 8, 2008 · efe6c3d · efe6c3d
1 parent 89b409f
commit efe6c3d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 50 deletions.
diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
@@ -136,7 +136,7 @@ extern char prom_getchar(void);
 extern void prom_putchar(char character);
 
 /* Prom's internal routines, don't use in kernel/boot code. */
-extern void prom_printf(char *fmt, ...);
+extern void prom_printf(const char *fmt, ...);
 extern void prom_write(const char *buf, unsigned int len);
 
 /* Multiprocessor operations... */

diff --git a/arch/sparc/prom/Makefile b/arch/sparc/prom/Makefile
@@ -15,7 +15,7 @@ lib-$(CONFIG_SPARC32) += palloc.o
 lib-$(CONFIG_SPARC32) += ranges.o
 lib-$(CONFIG_SPARC32) += segment.o
 lib-y                 += console_$(BITS).o
-lib-y                 += printf_$(BITS).o
+lib-y                 += printf.o
 lib-y                 += tree_$(BITS).o
 lib-$(CONFIG_SPARC64) += p1275.o
 lib-$(CONFIG_SPARC64) += cif.o
diff --git a/arch/sparc/prom/printf_64.c → arch/sparc/prom/printf.c b/arch/sparc/prom/printf_64.c → arch/sparc/prom/printf.c
diff --git a/arch/sparc/prom/printf_32.c b/arch/sparc/prom/printf_32.c