git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream'
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
mconsole_kern.c
diff --git
a/arch/um/drivers/mconsole_kern.c
b/arch/um/drivers/mconsole_kern.c
index
be61012
..
e3d5765
100644
(file)
--- a/
arch/um/drivers/mconsole_kern.c
+++ b/
arch/um/drivers/mconsole_kern.c
@@
-500,7
+500,7
@@
static void console_write(struct console *console, const char *string,
static struct console mc_console = { .name = "mc",
.write = console_write,
- .flags = CON_
PRINTBUFFER | CON_
ENABLED,
+ .flags = CON_ENABLED,
.index = -1 };
static int mc_add_console(void)