summaryrefslogtreecommitdiff
path: root/drivers/serial
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-08-24 02:53:39 +0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-08-24 02:53:39 +0400
commitb8b99e857d0e258b0da17e55466e5142465d35fd (patch)
tree7cae85965f21792664506e9f85f2a983ee0ee53d /drivers/serial
parent0f4184f73d5233214d3225a94fcf1bd4d6678d74 (diff)
downloadlinux-b8b99e857d0e258b0da17e55466e5142465d35fd.tar.xz
[SERIAL] sunzilog: Mirror the sunsab serial setup bug fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/sunzilog.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 47bc3d57e019..d34f336d53d8 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1146,6 +1146,9 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
unsigned long flags;
int baud, brg;
+ if (up->port.type != PORT_SUNZILOG)
+ return -1;
+
printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n",
(sunzilog_reg.minor - 64) + con->index, con->index);