---

yaml --- r: 123388 b: refs/heads/master c: efe6c3d h: refs/heads/master v: v3
git-mirror · Dec 8, 2008 · ab877d5 · ab877d5
1 parent 35cce25
commit ab877d5
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 51 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89b409f77017171c55e79628eefc557126c8fd7f
+refs/heads/master: efe6c3dd8b7df809d46fb521eb9af471c47ed608
diff --git a/trunk/arch/sparc/include/asm/oplib_32.h b/trunk/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/trunk/arch/sparc/prom/Makefile b/trunk/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/trunk/arch/sparc/prom/printf_64.c → trunk/arch/sparc/prom/printf.c b/trunk/arch/sparc/prom/printf_64.c → trunk/arch/sparc/prom/printf.c
diff --git a/trunk/arch/sparc/prom/printf_32.c b/trunk/arch/sparc/prom/printf_32.c