Commit 7aa6ec22 authored by Laura Abbott's avatar Laura Abbott Committed by David S. Miller

drivers: net: phy: Correct duplicate MDIO_XGENE entry

An extra entry for MDIO_XGENE got added during merging.
Delete it.
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarLaura Abbott <labbott@redhat.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5e0fbfc
...@@ -142,6 +142,7 @@ config MDIO_THUNDER ...@@ -142,6 +142,7 @@ config MDIO_THUNDER
config MDIO_XGENE config MDIO_XGENE
tristate "APM X-Gene SoC MDIO bus controller" tristate "APM X-Gene SoC MDIO bus controller"
depends on ARCH_XGENE || COMPILE_TEST
help help
This module provides a driver for the MDIO busses found in the This module provides a driver for the MDIO busses found in the
APM X-Gene SoC's. APM X-Gene SoC's.
...@@ -320,13 +321,6 @@ config XILINX_GMII2RGMII ...@@ -320,13 +321,6 @@ config XILINX_GMII2RGMII
the Reduced Gigabit Media Independent Interface(RGMII) between the Reduced Gigabit Media Independent Interface(RGMII) between
Ethernet physical media devices and the Gigabit Ethernet controller. 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 endif # PHYLIB
config MICREL_KS8995MA config MICREL_KS8995MA
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment