diff options
author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /arch/ppc64/boot/prom.c | |
parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'arch/ppc64/boot/prom.c')
-rw-r--r-- | arch/ppc64/boot/prom.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/ppc64/boot/prom.c b/arch/ppc64/boot/prom.c index d5218b15824e..5e48b80ff5a0 100644 --- a/arch/ppc64/boot/prom.c +++ b/arch/ppc64/boot/prom.c | |||
@@ -40,7 +40,7 @@ void *finddevice(const char *name); | |||
40 | int getprop(void *phandle, const char *name, void *buf, int buflen); | 40 | int getprop(void *phandle, const char *name, void *buf, int buflen); |
41 | void chrpboot(int a1, int a2, void *prom); /* in main.c */ | 41 | void chrpboot(int a1, int a2, void *prom); /* in main.c */ |
42 | 42 | ||
43 | void printk(char *fmt, ...); | 43 | int printf(char *fmt, ...); |
44 | 44 | ||
45 | /* there is no convenient header to get this from... -- paulus */ | 45 | /* there is no convenient header to get this from... -- paulus */ |
46 | extern unsigned long strlen(const char *); | 46 | extern unsigned long strlen(const char *); |
@@ -220,7 +220,7 @@ readchar(void) | |||
220 | case 1: | 220 | case 1: |
221 | return ch; | 221 | return ch; |
222 | case -1: | 222 | case -1: |
223 | printk("read(stdin) returned -1\r\n"); | 223 | printf("read(stdin) returned -1\r\n"); |
224 | return -1; | 224 | return -1; |
225 | } | 225 | } |
226 | } | 226 | } |
@@ -627,18 +627,6 @@ int sprintf(char * buf, const char *fmt, ...) | |||
627 | 627 | ||
628 | static char sprint_buf[1024]; | 628 | static char sprint_buf[1024]; |
629 | 629 | ||
630 | void | ||
631 | printk(char *fmt, ...) | ||
632 | { | ||
633 | va_list args; | ||
634 | int n; | ||
635 | |||
636 | va_start(args, fmt); | ||
637 | n = vsprintf(sprint_buf, fmt, args); | ||
638 | va_end(args); | ||
639 | write(stdout, sprint_buf, n); | ||
640 | } | ||
641 | |||
642 | int | 630 | int |
643 | printf(char *fmt, ...) | 631 | printf(char *fmt, ...) |
644 | { | 632 | { |