Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

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)
         u32* volatile cyclone_timer;    /* Cyclone MPMC0 register */
 
         if (!use_cyclone)
-                return -ENODEV;
+                return 0;
 
         printk(KERN_INFO "Summit chipset: Starting Cyclone Counter.\n");