X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fdrivers%2Fstdio_console.c;h=71593674ce07fe1a4c1eadfa02cbbaddfdc7cc55;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=90fb3a7e18e3e372f2df2e70956bc7d014763c75;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
index 90fb3a7e1..71593674c 100644
--- a/arch/um/drivers/stdio_console.c
+++ b/arch/um/drivers/stdio_console.c
@@ -191,8 +191,8 @@ int stdio_init(void)
 
 late_initcall(stdio_init);
 
-static void uml_console_write(struct console *console, const char *string, 
-			      unsigned len)
+static void console_write(struct console *console, const char *string, 
+			  unsigned len)
 {
 	struct line *line = &vts[console->index];
 
@@ -203,22 +203,22 @@ static void uml_console_write(struct console *console, const char *string,
 		up(&line->sem);
 }
 
-static struct tty_driver *uml_console_device(struct console *c, int *index)
+static struct tty_driver *console_device(struct console *c, int *index)
 {
 	*index = c->index;
 	return console_driver;
 }
 
-static int uml_console_setup(struct console *co, char *options)
+static int console_setup(struct console *co, char *options)
 {
 	return(0);
 }
 
 static struct console stdiocons = {
 	name:		"tty",
-	write:		uml_console_write,
-	device:		uml_console_device,
-	setup:		uml_console_setup,
+	write:		console_write,
+	device:		console_device,
+	setup:		console_setup,
 	flags:		CON_PRINTBUFFER,
 	index:		-1,
 };