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]
/
include
/
asm-ia64
/
cyclone.h
diff --git
a/include/asm-ia64/cyclone.h
b/include/asm-ia64/cyclone.h
index
89cc100
..
88f6500
100644
(file)
--- a/
include/asm-ia64/cyclone.h
+++ b/
include/asm-ia64/cyclone.h
@@
-3,10
+3,10
@@
#ifdef CONFIG_IA64_CYCLONE
extern int use_cyclone;
#ifdef CONFIG_IA64_CYCLONE
extern int use_cyclone;
-extern
int __init cyclone_setup(char*
);
+extern
void __init cyclone_setup(void
);
#else /* CONFIG_IA64_CYCLONE */
#define use_cyclone 0
#else /* CONFIG_IA64_CYCLONE */
#define use_cyclone 0
-static inline void cyclone_setup(
char* s
)
+static inline void cyclone_setup(
void
)
{
printk(KERN_ERR "Cyclone Counter: System not configured"
" w/ CONFIG_IA64_CYCLONE.\n");
{
printk(KERN_ERR "Cyclone Counter: System not configured"
" w/ CONFIG_IA64_CYCLONE.\n");