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 Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
arch
/
alpha
/
Kconfig
diff --git
a/arch/alpha/Kconfig
b/arch/alpha/Kconfig
index
8750067
..
60fdd21
100644
(file)
--- a/
arch/alpha/Kconfig
+++ b/
arch/alpha/Kconfig
@@
-381,7
+381,7
@@
config ALPHA_EV56
config ALPHA_EV56
prompt "EV56 CPU (speed >= 333MHz)?"
- depends on ALPHA_NORITAKE
&&
ALPHA_PRIMO
+ depends on ALPHA_NORITAKE
||
ALPHA_PRIMO
config ALPHA_EV56
prompt "EV56 CPU (speed >= 400MHz)?"