|
 |
d5611d6 |
From b0a46f7c26a6c754ff4fc716741c5aeacf125ec9 Mon Sep 17 00:00:00 2001
|
|
|
d5611d6 |
From: Laura Abbott <labbott@redhat.com>
|
|
|
d5611d6 |
Date: Thu, 6 Oct 2016 11:15:11 -0700
|
|
|
d5611d6 |
Subject: [PATCH] drivers: net: phy: Correct duplicate MDIO_XGENE entry
|
|
|
d5611d6 |
|
|
|
d5611d6 |
An extra entry for MDIO_XGENE got added during merging.
|
|
|
d5611d6 |
Delete the extra.
|
|
|
d5611d6 |
|
|
|
d5611d6 |
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
|
d5611d6 |
Signed-off-by: Laura Abbott <labbott@redhat.com>
|
|
|
d5611d6 |
---
|
|
|
d5611d6 |
drivers/net/phy/Kconfig | 8 +-------
|
|
|
d5611d6 |
1 file changed, 1 insertion(+), 7 deletions(-)
|
|
|
d5611d6 |
|
|
|
d5611d6 |
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
|
|
|
d5611d6 |
index 5078a0d..2651c8d 100644
|
|
|
d5611d6 |
--- a/drivers/net/phy/Kconfig
|
|
|
d5611d6 |
+++ b/drivers/net/phy/Kconfig
|
|
|
d5611d6 |
@@ -142,6 +142,7 @@ config MDIO_THUNDER
|
|
|
d5611d6 |
|
|
|
d5611d6 |
config MDIO_XGENE
|
|
|
d5611d6 |
tristate "APM X-Gene SoC MDIO bus controller"
|
|
|
d5611d6 |
+ depends on ARCH_XGENE || COMPILE_TEST
|
|
|
d5611d6 |
help
|
|
|
d5611d6 |
This module provides a driver for the MDIO busses found in the
|
|
|
d5611d6 |
APM X-Gene SoC's.
|
|
|
d5611d6 |
@@ -320,13 +321,6 @@ config XILINX_GMII2RGMII
|
|
|
d5611d6 |
the Reduced Gigabit Media Independent Interface(RGMII) between
|
|
|
d5611d6 |
Ethernet physical media devices and the Gigabit Ethernet controller.
|
|
|
d5611d6 |
|
|
|
d5611d6 |
-config MDIO_XGENE
|
|
|
d5611d6 |
- tristate "APM X-Gene SoC MDIO bus controller"
|
|
|
d5611d6 |
- depends on ARCH_XGENE || COMPILE_TEST
|
|
|
d5611d6 |
- help
|
|
|
d5611d6 |
- This module provides a driver for the MDIO busses found in the
|
|
|
d5611d6 |
- APM X-Gene SoC's.
|
|
|
d5611d6 |
-
|
|
|
d5611d6 |
endif # PHYLIB
|
|
|
d5611d6 |
|
|
|
d5611d6 |
config MICREL_KS8995MA
|
|
|
d5611d6 |
--
|
|
|
d5611d6 |
2.7.4
|
|
|
d5611d6 |
|