From patchwork Wed May 23 06:36:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuseppe CAVALLARO X-Patchwork-Id: 160878 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 16518B7021 for ; Wed, 23 May 2012 16:36:40 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755788Ab2EWGga (ORCPT ); Wed, 23 May 2012 02:36:30 -0400 Received: from eu1sys200aog116.obsmtp.com ([207.126.144.141]:60138 "EHLO eu1sys200aog116.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965103Ab2EWGgX (ORCPT ); Wed, 23 May 2012 02:36:23 -0400 Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob116.postini.com ([207.126.147.11]) with SMTP ID DSNKT7yFZaP7o/nt0s0GjsPFiDQMEJnfM680@postini.com; Wed, 23 May 2012 06:36:22 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1B64C97; Wed, 23 May 2012 06:36:20 +0000 (GMT) Received: from mail7.sgp.st.com (mail7.sgp.st.com [164.129.223.81]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A54281E8E; Wed, 23 May 2012 06:36:20 +0000 (GMT) Received: from localhost (lxmcdt5.ctn.st.com [164.130.129.175]) by mail7.sgp.st.com (MOS 4.3.3-GA) with ESMTP id AMG39904 (AUTH cavagiu); Wed, 23 May 2012 08:36:20 +0200 From: Giuseppe CAVALLARO To: netdev@vger.kernel.org Cc: Giuseppe Cavallaro , Rayagond Kokatanur Subject: [PATCH 3/4] stmmac: fix driver Kconfig when built as module Date: Wed, 23 May 2012 08:36:03 +0200 Message-Id: <1337754964-21754-3-git-send-email-peppe.cavallaro@st.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1337754964-21754-1-git-send-email-peppe.cavallaro@st.com> References: <1337754964-21754-1-git-send-email-peppe.cavallaro@st.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patches fixes the driver when built as dyn module. In fact the platform part cannot be built and the probe fails (thanks to Bob Liu that reported this bug). The patch also makes the selection of Platform and PCI parts mutually exclusive. Reported-by: Bob Liu Signed-off-by: Giuseppe Cavallaro Reviewed-by: Ben Hutchings cc: Rayagond Kokatanur --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index 0364283..3318b32 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -12,10 +12,12 @@ config STMMAC_ETH if STMMAC_ETH +choice + prompt "STMMAC bus support" + config STMMAC_PLATFORM - tristate "STMMAC platform bus support" + bool "Platform bus support" depends on STMMAC_ETH - default y ---help--- This selects the platform specific bus support for the stmmac device driver. This is the driver used @@ -26,7 +28,7 @@ config STMMAC_PLATFORM If unsure, say N. config STMMAC_PCI - tristate "STMMAC support on PCI bus (EXPERIMENTAL)" + bool "PCI bus support (EXPERIMENTAL)" depends on STMMAC_ETH && PCI && EXPERIMENTAL ---help--- This is to select the Synopsys DWMAC available on PCI devices, @@ -36,6 +38,7 @@ config STMMAC_PCI D1215994A VIRTEX FPGA board. If unsure, say N. +endchoice config STMMAC_DEBUG_FS bool "Enable monitoring via sysFS "