Hello All,
this patch fixes the serial console init for ip22. Currently the
console gets registered twice, with the funny effect of an endless
which continuosly prints the first line of the printk buffer.
Thiemo
Index: drivers/serial/ip22zilog.c
===================================================================
RCS file: /home/cvs/linux/drivers/serial/ip22zilog.c,v
retrieving revision 1.15
diff -u -p -r1.15 ip22zilog.c
--- drivers/serial/ip22zilog.c 28 Sep 2004 19:22:07 -0000 1.15
+++ drivers/serial/ip22zilog.c 20 Nov 2004 16:46:58 -0000
@@ -1100,28 +1100,19 @@ static struct console ip22zilog_console
.index = -1,
.data = &ip22zilog_reg,
};
-#define IP22ZILOG_CONSOLE (&ip22zilog_console)
-
-static int __init ip22zilog_console_init(void)
-{
- register_console(&ip22zilog_console);
- return 0;
-}
-#else /* CONFIG_SERIAL_IP22_ZILOG_CONSOLE */
-#define IP22ZILOG_CONSOLE (NULL)
-#define ip22zilog_console_init() do { } while (0)
-#endif
+#endif /* CONFIG_SERIAL_IP22_ZILOG_CONSOLE */
static struct uart_driver ip22zilog_reg = {
.owner = THIS_MODULE,
.driver_name = "serial",
- .devfs_name = "tty/",
+ .devfs_name = "tts/",
.dev_name = "ttyS",
.major = TTY_MAJOR,
.minor = 64,
.nr = NUM_CHANNELS,
- .cons = IP22ZILOG_CONSOLE,
-
+#ifdef CONFIG_SERIAL_IP22_ZILOG_CONSOLE
+ .cons = &ip22zilog_console,
+#endif
};
static void __init ip22zilog_prepare(void)
@@ -1254,7 +1245,6 @@ static int __init ip22zilog_init(void)
/* IP22 Zilog setup is hard coded, no probing to do. */
ip22zilog_alloc_tables();
ip22zilog_ports_init();
- ip22zilog_console_init();
return 0;
}
