summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-13 09:56:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-13 09:56:24 +0100
commit74b8721099992b76d3faff78cb8a5d13c65c3529 (patch)
tree2c9971160051cae98237715f791ce2b93a0720b5 /drivers/net/phy/Kconfig
parent4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (diff)
parentbaffe1699c68da5040de6b274054adc995795782 (diff)
downloadlinux-74b8721099992b76d3faff78cb8a5d13c65c3529.tar.bz2
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'drivers/net/phy/Kconfig')
-rw-r--r--drivers/net/phy/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index fc5938ba3d78..a527e37728cd 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -88,6 +88,11 @@ config LSI_ET1011C_PHY
---help---
Supports the LSI ET1011C PHY.
+config MICREL_PHY
+ tristate "Driver for Micrel PHYs"
+ ---help---
+ Supports the KSZ9021, VSC8201, KS8001 PHYs.
+
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y