[PATCH] uml: rename console_device

In the -mm tree (in this moment) and not in 2.6.7 there is another
console_device in include/linux/console.h; so I renamed the UML one (it's
static).

Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 71593674ce07fe1a4c1eadfa02cbbaddfdc7cc55..5fdc50db6f0a9c5d256d5b675cc7079c9cb68252 100644 (file)
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -203,7 +203,7 @@ static void console_write(struct console *console, const char *string,
                up(&line->sem);
 }
 
-static struct tty_driver *console_device(struct console *c, int *index)
+static struct tty_driver *um_console_device(struct console *c, int *index)
 {
        *index = c->index;
        return console_driver;
@@ -217,7 +217,7 @@ static int console_setup(struct console *co, char *options)
 static struct console stdiocons = {
        name:           "tty",
        write:          console_write,
-       device:         console_device,
+       device:         um_console_device,
        setup:          console_setup,
        flags:          CON_PRINTBUFFER,
        index:          -1,