git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
cyclone.c
diff --git
a/arch/ia64/kernel/cyclone.c
b/arch/ia64/kernel/cyclone.c
index
05ec3ca
..
19300e9
100644
(file)
--- a/
arch/ia64/kernel/cyclone.c
+++ b/
arch/ia64/kernel/cyclone.c
@@
-10,10
+10,9
@@
#define CYCLONE_TIMER_FREQ 100000000
int use_cyclone;
-
int __init cyclone_setup(char *str
)
+
void __init cyclone_setup(void
)
{
use_cyclone = 1;
- return 1;
}
static u32* volatile cyclone_timer; /* Cyclone MPMC0 register */