diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 16:20:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 16:20:46 -0500 |
| commit | 432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2 (patch) | |
| tree | 03632e1083e70f0b06211dae5695fb04fa3fd018 /drivers/serial | |
| parent | f78bb8ad482267b92c122f0e37a7dce69c880247 (diff) | |
| parent | e1c48554ae295de984eee83a7798e7fb394a1629 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] mca recovery return value when no bus check
[IA64] SGI SN drivers: don't report !sn2 hardware as an error
[IA64] don't report !sn2 or !summit hardware as an error
[IA64] gensparse_defconfig: turn on PNPACPI
[IA64] Increase severity of MCA recovery messages
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sn_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 43e67d6c29d4..60ea4a3f0713 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
| @@ -820,7 +820,7 @@ static int __init sn_sal_module_init(void) | |||
| 820 | int retval; | 820 | int retval; |
| 821 | 821 | ||
| 822 | if (!ia64_platform_is("sn2")) | 822 | if (!ia64_platform_is("sn2")) |
| 823 | return -ENODEV; | 823 | return 0; |
| 824 | 824 | ||
| 825 | printk(KERN_INFO "sn_console: Console driver init\n"); | 825 | printk(KERN_INFO "sn_console: Console driver init\n"); |
| 826 | 826 | ||