diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2010-09-19 23:20:44 +0200 |
| commit | ec91b8ae6735a3f2977dc886ea63ff28e1aeef41 (patch) | |
| tree | 67ac2a696cdd345b543d8415c74166bed11e9d4f /linux/dev/kernel | |
| parent | 9d952fb2d44ec2199a1d08999ff7a68aa26e9507 (diff) | |
| parent | 45fcd2d09c15820e58e2334b80f7367d2f98ebb7 (diff) | |
Merge branch 'master' into HEAD
Conflicts:
ChangeLog
kern/bootstrap.c
kern/debug.c
vm/vm_object.c
Diffstat (limited to 'linux/dev/kernel')
| -rw-r--r-- | linux/dev/kernel/printk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/dev/kernel/printk.c b/linux/dev/kernel/printk.c index 9dc86cb3..1c45b245 100644 --- a/linux/dev/kernel/printk.c +++ b/linux/dev/kernel/printk.c @@ -27,6 +27,7 @@ #include <stdarg.h> #include <asm/system.h> #include <kern/assert.h> +#include <device/cons.h> static char buf[2048]; @@ -40,7 +41,6 @@ printk (char *fmt, ...) { va_list args; int n, flags; - extern void cnputc (); char *p, *msg, *buf_end; static int msg_level = -1; |