diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-23 22:12:23 -0400 |
| commit | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (patch) | |
| tree | 1cfe20bd31fce1b5b3024384fcb324c3338d1d32 /drivers/serial | |
| parent | 702c7e7626deeabb057b6f529167b65ec2eefbdb (diff) | |
| parent | 81065e2f415af6c028eac13f481fb9e60a0b487b (diff) | |
Merge from-linus to-akpm
Diffstat (limited to 'drivers/serial')
| -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 | ||