From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Fri, 3 Mar 2006 22:34:34 +0000 (-0700)
Subject: [IA64] SGI SN drivers: don't report !sn2 hardware as an error
X-Git-Tag: v2.6.16-rc6~79^2~1
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=f032f90809ebbbd28feb90f97add2e0a869a42ed;p=powerpc.git

[IA64] SGI SN drivers: don't report !sn2 hardware as an error

This stuff is all in the generic ia64 kernel, and the new initcall error
reporting complains about them.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c
index c92378121b..1b05fa6889 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 43e67d6c29..60ea4a3f07 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");