diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-03-01 06:56:43 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-03-04 14:02:37 -0500 |
commit | 36a885306fdf7bb557c773309c993bfb2d0d693c (patch) | |
tree | 643b246c90653c9451ff7fecff74a79c3de8042c /arch/mips/lib | |
parent | ca471c86043f4a8b01cba02ba2d3431fddcaf606 (diff) |
[MIPS] Fix and cleanup the mess that a dozen prom_printf variants are.
early_printk is a so much saner thing.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/lib')
-rw-r--r-- | arch/mips/lib/Makefile | 4 | ||||
-rw-r--r-- | arch/mips/lib/promlib.c | 24 |
2 files changed, 2 insertions, 26 deletions
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 52e0ec8bcb15..d7d3b14dcfb2 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile | |||
@@ -2,8 +2,8 @@ | |||
2 | # Makefile for MIPS-specific library files.. | 2 | # Makefile for MIPS-specific library files.. |
3 | # | 3 | # |
4 | 4 | ||
5 | lib-y += csum_partial.o memcpy.o memcpy-inatomic.o memset.o promlib.o \ | 5 | lib-y += csum_partial.o memcpy.o memcpy-inatomic.o memset.o strlen_user.o \ |
6 | strlen_user.o strncpy_user.o strnlen_user.o uncached.o | 6 | strncpy_user.o strnlen_user.o uncached.o |
7 | 7 | ||
8 | obj-y += iomap.o | 8 | obj-y += iomap.o |
9 | obj-$(CONFIG_PCI) += iomap-pci.o | 9 | obj-$(CONFIG_PCI) += iomap-pci.o |
diff --git a/arch/mips/lib/promlib.c b/arch/mips/lib/promlib.c deleted file mode 100644 index dddfe98b4ded..000000000000 --- a/arch/mips/lib/promlib.c +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | #include <stdarg.h> | ||
2 | #include <linux/kernel.h> | ||
3 | |||
4 | extern void prom_putchar(char); | ||
5 | |||
6 | void prom_printf(char *fmt, ...) | ||
7 | { | ||
8 | va_list args; | ||
9 | char ppbuf[1024]; | ||
10 | char *bptr; | ||
11 | |||
12 | va_start(args, fmt); | ||
13 | vsprintf(ppbuf, fmt, args); | ||
14 | |||
15 | bptr = ppbuf; | ||
16 | |||
17 | while (*bptr != 0) { | ||
18 | if (*bptr == '\n') | ||
19 | prom_putchar('\r'); | ||
20 | |||
21 | prom_putchar(*bptr++); | ||
22 | } | ||
23 | va_end(args); | ||
24 | } | ||