diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 22:20:46 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-08 22:20:46 +0100 |
| commit | 432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2 (patch) | |
| tree | 03632e1083e70f0b06211dae5695fb04fa3fd018 /drivers | |
| parent | slab: fix calculate_slab_order() for SLAB_RECLAIM_ACCOUNT (diff) | |
| parent | [IA64] mca recovery return value when no bus check (diff) | |
| download | linux-432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2.tar.xz linux-432e7c0dfe884b6ab1c32fd3f17c64c31d8fa7e2.zip | |
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')
| -rw-r--r-- | drivers/char/mmtimer.c | 2 | ||||
| -rw-r--r-- | drivers/serial/sn_console.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index c92378121b4c..1b05fa688996 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c @@ -675,7 +675,7 @@ static int __init mmtimer_init(void) cnodeid_t node, maxn = -1; if (!ia64_platform_is("sn2")) - return -1; + return 0; /* * Sanity check the cycles/sec variable 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) int retval; if (!ia64_platform_is("sn2")) - return -ENODEV; + return 0; printk(KERN_INFO "sn_console: Console driver init\n"); |