Merge tag 'md/3.13' of git://neil.brown.name/md

[~andy/linux] / drivers / net / phy / Kconfig

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 3a316b30089f9139384ef35b6424ccc6bd8fbe0a..9b5d46c03eed34d244bf279ea13bf38ffebea009 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -135,7 +135,7 @@ config MDIO_GPIO
 
 config MDIO_OCTEON
        tristate "Support for MDIO buses on Octeon SOCs"
-       depends on  CPU_CAVIUM_OCTEON
+       depends on CAVIUM_OCTEON_SOC
        default y
        help
 
@@ -154,6 +154,13 @@ config MDIO_SUN4I
          interface units of the Allwinner SoC that have an EMAC (A10,
          A12, A10s, etc.)
 
+config MDIO_MOXART
+        tristate "MOXA ART MDIO interface support"
+        depends on ARCH_MOXART
+        help
+          This driver supports the MDIO interface found in the network
+          interface units of the MOXA ART SoC
+
 config MDIO_BUS_MUX
        tristate
        depends on OF_MDIO