Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[cascardo/linux.git] / drivers / net / phy / Kconfig

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 1c3e07c..5078a0d 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -274,9 +274,9 @@ config MICROCHIP_PHY
          Supports the LAN88XX PHYs.
 
 config MICROSEMI_PHY
          Supports the LAN88XX PHYs.
 
 config MICROSEMI_PHY

-    tristate "Microsemi PHYs"
-    ---help---
-      Currently supports the VSC8531 and VSC8541 PHYs
+       tristate "Microsemi PHYs"
+       ---help---
+         Currently supports the VSC8531 and VSC8541 PHYs

 
 config NATIONAL_PHY
        tristate "National Semiconductor PHYs"
 
 config NATIONAL_PHY
        tristate "National Semiconductor PHYs"


@@ -320,6 +320,13 @@ config XILINX_GMII2RGMII
          the Reduced Gigabit Media Independent Interface(RGMII) between
          Ethernet physical media devices and the Gigabit Ethernet controller.
 
          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
 endif # PHYLIB
 
 config MICREL_KS8995MA