diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
| commit | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch) | |
| tree | 5886a08bfa1132058b06074f4666a36dc5ddd2a1 /drivers/serial/sn_console.c | |
| parent | 88274815f7477dc7550439413ab87c5ce4c5a623 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/serial/sn_console.c')
| -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 | ||