diff options
| author | Laura Abbott <labbott@redhat.com> | 2016-10-06 11:22:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-06 21:15:42 -0400 |
| commit | 7aa6ec2296614f2da8546bbfe8fca54bbbd8ae12 (patch) | |
| tree | 1874b91ba182fa363c53844bddfb4257ebfec381 /drivers/net | |
| parent | e5e0fbfc4e3b343ff985dd800f1ee31564793563 (diff) | |
| download | linux-7aa6ec2296614f2da8546bbfe8fca54bbbd8ae12.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/Kconfig | 8 |
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 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 |