summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando J. Pereda <ferdy@gentoo.org>2006-09-26 08:32:37 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 17:48:57 +0200
commit060ec3d52db417a4fa554b6e14594ca62418c326 (patch)
treedffaed20a64db6e891b5fb5648546eb337f7450d
parent[PATCH] mtrr: Add lock annotations for prepare_set and post_set (diff)
downloadlinux-060ec3d52db417a4fa554b6e14594ca62418c326.tar.xz
linux-060ec3d52db417a4fa554b6e14594ca62418c326.zip
[PATCH] alpha: Fix ALPHA_EV56 dependencies typo
There appears to be a typo in the EV56 config option. NORITAKE and PRIMO are be able to set a variation of either. Signed-off-by: Daniel Drake <dsd@gentoo.org> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/alpha/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 213c7850d5fb..2b36afd8e969 100644
--- 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)?"