aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/cyclone.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-11 17:47:20 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-11 17:47:20 -0500
commitd7fc3ca1cd0ecce82263299c6b1631fc83b0ec79 (patch)
treea6471779a25cf2794542f9441213f5aa5f337f2f /arch/ia64/kernel/cyclone.c
parentfbfda6e71bbdd3b4d41a56c3f20f31762c455a5e (diff)
parented62178589929d248a0aaf4018ca3867e2f96d9d (diff)
Merge branch 'master'
Diffstat (limited to 'arch/ia64/kernel/cyclone.c')
-rw-r--r--arch/ia64/kernel/cyclone.c2
1 files changed, 1 insertions, 1 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