Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763142AbXHAJep (ORCPT ); Wed, 1 Aug 2007 05:34:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759298AbXHAJef (ORCPT ); Wed, 1 Aug 2007 05:34:35 -0400 Received: from mtagate4.uk.ibm.com ([195.212.29.137]:32970 "EHLO mtagate4.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758831AbXHAJee (ORCPT ); Wed, 1 Aug 2007 05:34:34 -0400 Date: Wed, 1 Aug 2007 11:34:04 +0200 From: Heiko Carstens To: Andrew Morton Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, "John W. Linville" , Michael Buesch , Martin Schwidefsky Subject: [PATCH] prevent SSB compilation on s390 part 2 Message-ID: <20070801093404.GA12124@osiris.boeblingen.de.ibm.com> References: <20070731230932.a9459617.akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070731230932.a9459617.akpm@linux-foundation.org> User-Agent: Mutt/1.5.15 (2007-04-06) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1186 Lines: 33 From: Heiko Carstens drivers/ssb/Kconfig has already a depends on HAS_IOMEM which should prevent SSB from being selected. But appearantly it looks like this doesn't matter at all if it gets selected from somewhere else. So add an explicit depends on HAS_IOMEM to the Broadcom driver to prevent selection on s390. Cc: "John W. Linville" Cc: Michael Buesch Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens --- drivers/net/Kconfig | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6.22/drivers/net/Kconfig =================================================================== --- linux-2.6.22.orig/drivers/net/Kconfig +++ linux-2.6.22/drivers/net/Kconfig @@ -1434,6 +1434,7 @@ config APRICOT config B44 tristate "Broadcom 440x/47xx ethernet support" + depends on HAS_IOMEM select SSB select MII help - 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/