Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

[mv-sheeva.git] / arch / ia64 / kernel / cyclone.c

diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c
index 6ade3790ce07967ae09a3d65a1810c399ea5495c..e00b21514f7c665e97e1374d41c323ef915c1d57 100644 (file)
--- 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");