From: Fernando J. Pereda <ferdy@gentoo.org>
Date: Mon, 20 Nov 2006 17:04:19 +0000 (-0500)
Subject: [PATCH] alpha: Fix ALPHA_EV56 dependencies typo
X-Git-Tag: v2.6.18.5~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=542975fee3541dff69a4f064ad459940f54f1c32;p=thirdparty%2Fkernel%2Fstable.git

[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>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
---

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 213c7850d5fb9..2b36afd8e969e 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)?"