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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
core_marvel.c
diff --git
a/arch/alpha/kernel/core_marvel.c
b/arch/alpha/kernel/core_marvel.c
index
44866cb
..
7f6a984
100644
(file)
--- a/
arch/alpha/kernel/core_marvel.c
+++ b/
arch/alpha/kernel/core_marvel.c
@@
-435,7
+435,7
@@
marvel_specify_io7(char *str)
str = pchar;
} while(*str);
str = pchar;
} while(*str);
- return
0
;
+ return
1
;
}
__setup("io7=", marvel_specify_io7);
}
__setup("io7=", marvel_specify_io7);