From mboxrd@z Thu Jan 1 00:00:00 1970 From: Giuseppe CAVALLARO Subject: [net] stmmac: fix driver Kconfig when built as module Date: Wed, 23 May 2012 08:05:42 +0200 Message-ID: <1337753142-13762-1-git-send-email-peppe.cavallaro@st.com> References: <1337672336-7378-2-git-send-email-lliubbo@gmail.com> Cc: bhutchings@solarflare.com, lliubbo@gmail.com, Giuseppe Cavallaro , Rayagond Kokatanur To: netdev@vger.kernel.org Return-path: Received: from eu1sys200aog114.obsmtp.com ([207.126.144.137]:58835 "EHLO eu1sys200aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752737Ab2EWGGC (ORCPT ); Wed, 23 May 2012 02:06:02 -0400 In-Reply-To: <1337672336-7378-2-git-send-email-lliubbo@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: 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 " -- 1.7.4.4