From 10dfd4540d2aa1d0c51682fe14aa4d84d7672a25 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Wed, 23 Aug 2006 15:53:39 -0700
Subject: [PATCH] --- yaml --- r: 33452 b: refs/heads/master c:
 b8b99e857d0e258b0da17e55466e5142465d35fd h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/serial/sunzilog.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 86ef1e23451f..3895fd2d9929 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f4184f73d5233214d3225a94fcf1bd4d6678d74
+refs/heads/master: b8b99e857d0e258b0da17e55466e5142465d35fd
diff --git a/trunk/drivers/serial/sunzilog.c b/trunk/drivers/serial/sunzilog.c
index 47bc3d57e019..d34f336d53d8 100644
--- a/trunk/drivers/serial/sunzilog.c
+++ b/trunk/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);