diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-29 06:31:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-29 06:31:03 -0400 |
| commit | a5b17df04c4ad8f25fc598fce37fccb4b387c94c (patch) | |
| tree | 2d0084f6db86362eb067b617ff8470f255ba37e7 /drivers/net/phy/Kconfig | |
| parent | b79eeeb9e48457579cb742cd02e162fcd673c4a3 (diff) | |
| parent | c03571a3e22b821e5be7bda7b166c4554770f489 (diff) | |
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/Kconfig | 3 |
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 | |||
| 53 | config BROADCOM_PHY | 53 | config BROADCOM_PHY |
| 54 | tristate "Drivers for Broadcom PHYs" | 54 | tristate "Drivers for Broadcom PHYs" |
| 55 | ---help--- | 55 | ---help--- |
| 56 | Currently supports the BCM5411, BCM5421 and BCM5461 PHYs. | 56 | Currently supports the BCM5411, BCM5421, BCM5461, BCM5464, BCM5481 |
| 57 | and BCM5482 PHYs. | ||
| 57 | 58 | ||
| 58 | config ICPLUS_PHY | 59 | config ICPLUS_PHY |
| 59 | tristate "Drivers for ICPlus PHYs" | 60 | tristate "Drivers for ICPlus PHYs" |