Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758347AbWK2WDz (ORCPT ); Wed, 29 Nov 2006 17:03:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758344AbWK2WDx (ORCPT ); Wed, 29 Nov 2006 17:03:53 -0500 Received: from 216-99-217-87.dsl.aracnet.com ([216.99.217.87]:56020 "EHLO sous-sol.org") by vger.kernel.org with ESMTP id S1758267AbWK2WDi (ORCPT ); Wed, 29 Nov 2006 17:03:38 -0500 Message-Id: <20061129220526.952590000@sous-sol.org> References: <20061129220111.137430000@sous-sol.org> User-Agent: quilt/0.45-1 Date: Wed, 29 Nov 2006 14:00:26 -0800 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Daniel Drake , ferdy@gentoo.org, Richard Henderson , Ivan Kokshaysky Subject: [patch 15/23] alpha: Fix ALPHA_EV56 dependencies typo Content-Disposition: inline; filename=alpha-fix-alpha_ev56-dependencies-typo.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1186 Lines: 36 -stable review patch. If anyone has any objections, please let us know. ------------------ From: Fernando J. Pereda 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 Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright --- arch/alpha/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.18.4.orig/arch/alpha/Kconfig +++ linux-2.6.18.4/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)?" -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/