diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
| commit | a422142cfdf90d889d8d3e2affb8311a381530b7 (patch) | |
| tree | bde7e2c7a3ee8bca649aecd877a9ee1593f4223e /drivers/serial/sunzilog.c | |
| parent | 6fc47e31c0e802d205d67e644f654532e5d365d5 (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/serial/sunzilog.c')
| -rw-r--r-- | drivers/serial/sunzilog.c | 3 |
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) | |||
| 1146 | unsigned long flags; | 1146 | unsigned long flags; |
| 1147 | int baud, brg; | 1147 | int baud, brg; |
| 1148 | 1148 | ||
| 1149 | if (up->port.type != PORT_SUNZILOG) | ||
| 1150 | return -1; | ||
| 1151 | |||
| 1149 | printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n", | 1152 | printk(KERN_INFO "Console: ttyS%d (SunZilog zs%d)\n", |
| 1150 | (sunzilog_reg.minor - 64) + con->index, con->index); | 1153 | (sunzilog_reg.minor - 64) + con->index, con->index); |
| 1151 | 1154 | ||