From patchwork Mon Jun 27 11:13:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ralf Baechle X-Patchwork-Id: 920452 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5RBEr0n008795 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 27 Jun 2011 11:15:14 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qb9ld-0004ye-TV; Mon, 27 Jun 2011 11:14:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qb9lc-0004fz-Nv; Mon, 27 Jun 2011 11:14:12 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qb9lK-0004b9-HT for linux-arm-kernel@canuck.infradead.org; Mon, 27 Jun 2011 11:13:54 +0000 Received: from 2.b.7.5.8.e.f.7.3.1.e.1.9.e.0.7.0.0.0.0.a.e.3.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:3ea:0:70e9:1e13:7fe8:57b2] helo=duck.linux-mips.net) by casper.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qb9lH-0001Zh-NK for linux-arm-kernel@lists.infradead.org; Mon, 27 Jun 2011 11:13:53 +0000 Received: from duck.linux-mips.net (duck.linux-mips.net [127.0.0.1]) by duck.linux-mips.net (8.14.4/8.14.3) with ESMTP id p5RBD1hg014131; Mon, 27 Jun 2011 12:13:01 +0100 Received: (from ralf@localhost) by duck.linux-mips.net (8.14.4/8.14.4/Submit) id p5RBD0oZ014122; Mon, 27 Jun 2011 12:13:00 +0100 Date: Mon, 27 Jun 2011 12:13:00 +0100 From: Ralf Baechle To: "David S. Miller" , Eric Miao , Russell King , Ben Dooks , Paul Mundt , Jeff Garzik , Magnus Damm Subject: [PATCH v2] NET: AX88796: Tighten up Kconfig dependencies Message-ID: <20110627111259.GA13620@linux-mips.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110627_121351_984508_F9CA2BB5 X-CRM114-Status: GOOD ( 18.67 ) X-Spam-Score: -0.9 (/) X-Spam-Report: SpamAssassin version 3.3.2-r929478 on casper.infradead.org summary: Content analysis details: (-0.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 1.0 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS Cc: netdev@vger.kernel.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 27 Jun 2011 11:15:14 +0000 (UTC) In def47c5095d53814512bb0c62ec02dfdec769db1 [[netdrvr] Fix dependencies for ax88796 ne2k clone driver] the AX88796 driver got restricted to just be build for ARM and MIPS on the sole merrit that it was written for some ARM sytems and the driver had the misfortune to just build on MIPS, so MIPS was throw into the dependency for a good measure. Later 8687991a734a67f1638782c968f46fff0f94bb1f [ax88796: add superh to kconfig dependencies] added SH but only one in-tree SH system actually has an AX88796. Tighten up dependencies by using an auxilliary config sysmbol HAS_NET_AX88796 which is selected only by the platforms that actually have or may have an AX88796. This also means the driver won't be built anymore for any MIPS platform. Signed-off-by: Ralf Baechle --- v2: fixed Sergei's complaints about the log message arch/arm/mach-pxa/Kconfig | 2 ++ arch/arm/mach-s3c2410/Kconfig | 1 + arch/arm/mach-s3c2440/Kconfig | 1 + arch/sh/boards/Kconfig | 1 + drivers/net/Kconfig | 5 ++++- 5 files changed, 9 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index cd19309..37ce06f 100644 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@ -247,11 +247,13 @@ config MACH_COLIBRI300 select PXA3xx select CPU_PXA300 select CPU_PXA310 + select HAS_NET_AX88796 config MACH_COLIBRI320 bool "Toradex Colibri PXA320" select PXA3xx select CPU_PXA320 + select HAS_NET_AX88796 config MACH_COLIBRI_EVALBOARD bool "Toradex Colibri Evaluation Carrier Board support" diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index 7245a55..d665f92 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig @@ -122,6 +122,7 @@ config ARCH_BAST select S3C_DEV_HWMON select S3C_DEV_USB_HOST select S3C_DEV_NAND + select HAS_NET_AX88796 help Say Y here if you are using the Simtec Electronics EB2410ITX development board (also known as BAST) diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig index 50825a3..7ddbd22 100644 --- a/arch/arm/mach-s3c2440/Kconfig +++ b/arch/arm/mach-s3c2440/Kconfig @@ -86,6 +86,7 @@ config MACH_ANUBIS select S3C24XX_GPIO_EXTRA64 select S3C2440_XTAL_12000000 select S3C_DEV_USB_HOST + select HAS_NET_AX88796 help Say Y here if you are using the Simtec Electronics ANUBIS development system diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig index d893411..f23f332 100644 --- a/arch/sh/boards/Kconfig +++ b/arch/sh/boards/Kconfig @@ -162,6 +162,7 @@ config SH_HIGHLANDER depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 select SYS_SUPPORTS_PCI select IO_TRAPPED if MMU + select HAS_NET_AX88796 config SH_SH7757LCR bool "SH7757LCR" diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index be25e92..85d18c4 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -237,13 +237,16 @@ source "drivers/net/arm/Kconfig" config AX88796 tristate "ASIX AX88796 NE2000 clone support" - depends on ARM || MIPS || SUPERH + depends on HAS_NET_AX88796 select PHYLIB select MDIO_BITBANG help AX88796 driver, using platform bus to provide chip detection and resources +config HAS_NET_AX88796 + bool + config AX88796_93CX6 bool "ASIX AX88796 external 93CX6 eeprom support" depends on AX88796