diff options
| author |   James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 22:21:04 +1000 |
| commit | 043b4d40f53131c5f72eca2a46555fe35328a930 (patch) | |
| tree | 02a40eeb688f7ed9730e26a22f39ad7e04378de2 /drivers/net/phy/Kconfig | |
| parent | TOMOYO: Use mutex_lock_interruptible. (diff) | |
| parent | Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 (diff) | |
| download | linux-dev-043b4d40f53131c5f72eca2a46555fe35328a930.tar.xz linux-dev-043b4d40f53131c5f72eca2a46555fe35328a930.zip | |
Merge branch 'master' into next
Conflicts:
security/keys/keyring.c
Resolved conflict with whitespace fix in find_keyring_by_name()
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/net/phy/Kconfig')
| -rw-r--r-- | drivers/net/phy/Kconfig | 5 |
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 |