This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ia64 / kernel / cyclone.c

diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c
index 19300e9..05ec3ca 100644 (file)
--- a/arch/ia64/kernel/cyclone.c
+++ b/arch/ia64/kernel/cyclone.c
@@ -10,9 +10,10 @@
 #define CYCLONE_TIMER_FREQ 100000000
 
 int use_cyclone;
-void __init cyclone_setup(void)
+int __init cyclone_setup(char *str)
 {
        use_cyclone = 1;
+       return 1;
 }
 
 static u32* volatile cyclone_timer;    /* Cyclone MPMC0 register */