summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-05-29 03:31:03 -0700
committerDavid S. Miller <davem@davemloft.net>2008-05-29 03:31:03 -0700
commita5b17df04c4ad8f25fc598fce37fccb4b387c94c (patch)
tree2d0084f6db86362eb067b617ff8470f255ba37e7 /drivers/net/phy/Kconfig
parentb79eeeb9e48457579cb742cd02e162fcd673c4a3 (diff)
parentc03571a3e22b821e5be7bda7b166c4554770f489 (diff)
downloadblackbird-op-linux-a5b17df04c4ad8f25fc598fce37fccb4b387c94c.tar.gz
blackbird-op-linux-a5b17df04c4ad8f25fc598fce37fccb4b387c94c.zip
Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/phy/Kconfig')
-rw-r--r--drivers/net/phy/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 6eb2d31d1e34..284217c12839 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -53,7 +53,8 @@ config SMSC_PHY
config BROADCOM_PHY
tristate "Drivers for Broadcom PHYs"
---help---
- Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
+ Currently supports the BCM5411, BCM5421, BCM5461, BCM5464, BCM5481
+ and BCM5482 PHYs.
config ICPLUS_PHY
tristate "Drivers for ICPlus PHYs"
OpenPOWER on IntegriCloud