diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2006-03-03 17:33:47 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-03-07 18:26:49 -0500 |
commit | 6c5e62159cdef89d8385958c9d8c88efa867110c (patch) | |
tree | a8521cbb2e2cee9f5c9d9a9646811ae35d846d2f | |
parent | 57ebc9918f8747c9db7e65659dfd632d4db99e3a (diff) |
[IA64] don't report !sn2 or !summit 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>
-rw-r--r-- | arch/ia64/kernel/cyclone.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/sn2/sn2_smp.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/tiocx.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c index 6ade3790ce07..e00b21514f7c 100644 --- a/arch/ia64/kernel/cyclone.c +++ b/arch/ia64/kernel/cyclone.c | |||
@@ -36,7 +36,7 @@ int __init init_cyclone_clock(void) | |||
36 | u32* volatile cyclone_timer; /* Cyclone MPMC0 register */ | 36 | u32* volatile cyclone_timer; /* Cyclone MPMC0 register */ |
37 | 37 | ||
38 | if (!use_cyclone) | 38 | if (!use_cyclone) |
39 | return -ENODEV; | 39 | return 0; |
40 | 40 | ||
41 | printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n"); | 41 | printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n"); |
42 | 42 | ||
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 24eefb2fc55f..b2e1e746b47f 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c | |||
@@ -446,7 +446,7 @@ static struct proc_dir_entry *proc_sn2_ptc; | |||
446 | static int __init sn2_ptc_init(void) | 446 | static int __init sn2_ptc_init(void) |
447 | { | 447 | { |
448 | if (!ia64_platform_is("sn2")) | 448 | if (!ia64_platform_is("sn2")) |
449 | return -ENOSYS; | 449 | return 0; |
450 | 450 | ||
451 | if (!(proc_sn2_ptc = create_proc_entry(PTC_BASENAME, 0444, NULL))) { | 451 | if (!(proc_sn2_ptc = create_proc_entry(PTC_BASENAME, 0444, NULL))) { |
452 | printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME); | 452 | printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME); |
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index 8a56f8b5ffa2..99cb28e74295 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c | |||
@@ -484,7 +484,7 @@ static int __init tiocx_init(void) | |||
484 | int found_tiocx_device = 0; | 484 | int found_tiocx_device = 0; |
485 | 485 | ||
486 | if (!ia64_platform_is("sn2")) | 486 | if (!ia64_platform_is("sn2")) |
487 | return -ENODEV; | 487 | return 0; |
488 | 488 | ||
489 | bus_register(&tiocx_bus_type); | 489 | bus_register(&tiocx_bus_type); |
490 | 490 | ||