git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
phy
/
Kconfig
diff --git
a/drivers/net/phy/Kconfig
b/drivers/net/phy/Kconfig
index
fc5938b
..
a527e37
100644
(file)
--- a/
drivers/net/phy/Kconfig
+++ b/
drivers/net/phy/Kconfig
@@
-88,6
+88,11
@@
config LSI_ET1011C_PHY
---help---
Supports the 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
config FIXED_PHY
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
depends on PHYLIB=y