diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 23:05:59 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 23:05:59 +0200 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /arch/powerpc/boot/stdio.c | |
| parent | Remove offsetof() from user-visible <linux/stddef.h> (diff) | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-02b25fcff676125a88169c8a78d4c6dd647574ed.tar.xz linux-02b25fcff676125a88169c8a78d4c6dd647574ed.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/boot/stdio.c')
| -rw-r--r-- | arch/powerpc/boot/stdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/stdio.c b/arch/powerpc/boot/stdio.c index b5aa522f8b77..6d5f6382e1ce 100644 --- a/arch/powerpc/boot/stdio.c +++ b/arch/powerpc/boot/stdio.c @@ -10,7 +10,7 @@ #include <stddef.h> #include "string.h" #include "stdio.h" -#include "prom.h" +#include "ops.h" size_t strnlen(const char * s, size_t count) { @@ -320,6 +320,6 @@ printf(const char *fmt, ...) va_start(args, fmt); n = vsprintf(sprint_buf, fmt, args); va_end(args); - write(stdout, sprint_buf, n); + console_ops.write(sprint_buf, n); return n; } |