[PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry

Path	csiph.com!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Laura Abbott <labbott@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry
Date	Thu, 06 Oct 2016 20:50:02 +0200
Message-ID	<splTY-4ES-9@gated-at.bofh.it> (permalink)
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9tv5OxqtOHEPCfo/SYq08DAUzhIXw1g44AC3y2ufyBs=; b=j7nL+gk1AC/jzHZ2wSPjDQ8j42cmJVRc+kRmKwcb+92VSIOU4ymz3K8zcmmjMK9gSo Vckp6+9WZ9qUVdl+2f6nqSbfhzVSwgFkcTDvXjoWO0XUUp1Lfus8ASHJpRfp57Lmido7 w0vzNe6+RGUAVTV8WO6Mw3lxSeUCMxepv2u87WWC6VOsRb0lcElnxFxWcDCsLqNE/ldx MyN3okxF84UaSKMH8IPCt09RuDuC3Jv3rv1teuOK6wzs9srVfU1O5bfjD3H8kfuAsn/p ChChuD8vFi+/7OXBjNu+JKxcRBHt5IlsT5PeIshTPekjiZ+UiSxrRmV0FLWR7IiKhgzu pOgw==
X-Gm-Message-State	AA6/9Rk5RLjuSqNvMMqD7ncEPQatOoJVzNfHqPQkoxF2mIVUufODWkcvEifkHNwQ7+UVHS0w
X-Received	by 10.107.149.85 with SMTP id x82mr15739486iod.197.1475778177953; Thu, 06 Oct 2016 11:22:57 -0700 (PDT)
X-Mailer	git-send-email 2.7.4
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	37
Organization	linux.* mail to news gateway
X-Original-Cc	Laura Abbott <labbott@redhat.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
X-Original-Date	Thu, 6 Oct 2016 11:22:51 -0700
X-Original-Message-ID	<1475778171-10905-1-git-send-email-labbott@redhat.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1496811

Show key headers only | View raw

An extra entry for MDIO_XGENE got added during merging.
Delete it.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Laura Abbott <labbott@redhat.com>
---
 drivers/net/phy/Kconfig | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 5078a0d..2651c8d 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -142,6 +142,7 @@ config MDIO_THUNDER
 
 config MDIO_XGENE
 	tristate "APM X-Gene SoC MDIO bus controller"
+	depends on ARCH_XGENE || COMPILE_TEST
 	help
 	  This module provides a driver for the MDIO busses found in the
 	  APM X-Gene SoC's.
@@ -320,13 +321,6 @@ config XILINX_GMII2RGMII
          the Reduced Gigabit Media Independent Interface(RGMII) between
          Ethernet physical media devices and the Gigabit Ethernet controller.
 
-config MDIO_XGENE
-	tristate "APM X-Gene SoC MDIO bus controller"
-	depends on ARCH_XGENE || COMPILE_TEST
-	help
-	  This module provides a driver for the MDIO busses found in the
-	  APM X-Gene SoC's.
-
 endif # PHYLIB
 
 config MICREL_KS8995MA
-- 
2.7.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry Laura Abbott <labbott@redhat.com> - 2016-10-06 20:50 +0200
  Re: [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry Florian Fainelli <f.fainelli@gmail.com> - 2016-10-06 21:50 +0200
  Re: [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry David Miller <davem@davemloft.net> - 2016-10-07 03:20 +0200

csiph-web