summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-17 13:08:17 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-17 13:08:17 -0700
commitd3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b (patch)
tree7887d95ec36087946a2c4b4c9ee0850c361fe22f /drivers
parentc231c7db30faf93419fc22d680f74d816bea70e2 (diff)
parentc149ec05dcd09d525e6778e339122827c7cd79b8 (diff)
downloadblackbird-op-linux-d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b.tar.gz
blackbird-op-linux-d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b.zip
Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/sn_console.c1
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)
return -1;
sal_console_port.sc_ops = &poll_ops;
+ spin_lock_init(&sal_console_port.sc_port.lock);
early_sn_setup(); /* Find SAL entry points */
register_console(&sal_console_early);
OpenPOWER on IntegriCloud