diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 01:45:48 -0400 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /drivers/serial/sunsab.c | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/serial/sunsab.c')
| -rw-r--r-- | drivers/serial/sunsab.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index dc673e1b6fd9..cfe20f730436 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
| @@ -886,6 +886,15 @@ static int sunsab_console_setup(struct console *con, char *options) | |||
| 886 | unsigned long flags; | 886 | unsigned long flags; |
| 887 | unsigned int baud, quot; | 887 | unsigned int baud, quot; |
| 888 | 888 | ||
| 889 | /* | ||
| 890 | * The console framework calls us for each and every port | ||
| 891 | * registered. Defer the console setup until the requested | ||
| 892 | * port has been properly discovered. A bit of a hack, | ||
| 893 | * though... | ||
| 894 | */ | ||
| 895 | if (up->port.type != PORT_SUNSAB) | ||
| 896 | return -1; | ||
| 897 | |||
| 889 | printk("Console: ttyS%d (SAB82532)\n", | 898 | printk("Console: ttyS%d (SAB82532)\n", |
| 890 | (sunsab_reg.minor - 64) + con->index); | 899 | (sunsab_reg.minor - 64) + con->index); |
| 891 | 900 | ||