aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2016-10-06 14:22:51 -0400
committerDavid S. Miller <davem@davemloft.net>2016-10-06 21:15:42 -0400
commit7aa6ec2296614f2da8546bbfe8fca54bbbd8ae12 (patch)
tree1874b91ba182fa363c53844bddfb4257ebfec381
parente5e0fbfc4e3b343ff985dd800f1ee31564793563 (diff)
drivers: net: phy: Correct duplicate MDIO_XGENE entry
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> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/Kconfig8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 5078a0d0db64..2651c8d8de2f 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -142,6 +142,7 @@ config MDIO_THUNDER
142 142
143config MDIO_XGENE 143config MDIO_XGENE
144 tristate "APM X-Gene SoC MDIO bus controller" 144 tristate "APM X-Gene SoC MDIO bus controller"
145 depends on ARCH_XGENE || COMPILE_TEST
145 help 146 help
146 This module provides a driver for the MDIO busses found in the 147 This module provides a driver for the MDIO busses found in the
147 APM X-Gene SoC's. 148 APM X-Gene SoC's.
@@ -320,13 +321,6 @@ config XILINX_GMII2RGMII
320 the Reduced Gigabit Media Independent Interface(RGMII) between 321 the Reduced Gigabit Media Independent Interface(RGMII) between
321 Ethernet physical media devices and the Gigabit Ethernet controller. 322 Ethernet physical media devices and the Gigabit Ethernet controller.
322 323
323config MDIO_XGENE
324 tristate "APM X-Gene SoC MDIO bus controller"
325 depends on ARCH_XGENE || COMPILE_TEST
326 help
327 This module provides a driver for the MDIO busses found in the
328 APM X-Gene SoC's.
329
330endif # PHYLIB 324endif # PHYLIB
331 325
332config MICREL_KS8995MA 326config MICREL_KS8995MA