diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
commit | da61396d24e37258817e42537c482e962b4742f7 (patch) | |
tree | 4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /drivers/serial/sn_console.c | |
parent | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (diff) | |
parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) |
Merge upstream kernel into libata 'passthru' branch
Diffstat (limited to 'drivers/serial/sn_console.c')
-rw-r--r-- | drivers/serial/sn_console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 840815fde49b..12d1f14e78ce 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
@@ -1093,6 +1093,7 @@ int __init sn_serial_console_early_setup(void) | |||
1093 | return -1; | 1093 | return -1; |
1094 | 1094 | ||
1095 | sal_console_port.sc_ops = &poll_ops; | 1095 | sal_console_port.sc_ops = &poll_ops; |
1096 | spin_lock_init(&sal_console_port.sc_port.lock); | ||
1096 | early_sn_setup(); /* Find SAL entry points */ | 1097 | early_sn_setup(); /* Find SAL entry points */ |
1097 | register_console(&sal_console_early); | 1098 | register_console(&sal_console_early); |
1098 | 1099 | ||