Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus

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

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index a70244306c9462830c4ebde0b87334ef7667fa0e..fbdcdf83cbfd81b142fb228460b2effddd266cad 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -131,3 +131,7 @@ config MDIO_OCTEON
          If in doubt, say Y.
 
 endif # PHYLIB
+
+config MICREL_KS8995MA
+       tristate "Micrel KS8995MA 5-ports 10/100 managed Ethernet switch"
+       depends on SPI