Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / drivers / net / phy / Kconfig

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index b79ec0d7480fa9c411fd723cb93b13c5a47f344b..f994f129f3d8c17477edc0aded181253f57603de 100644 (file)
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -56,13 +56,19 @@ config SMSC_PHY
        ---help---
          Currently supports the LAN83C185 PHY
 
+config BROADCOM_PHY
+       tristate "Drivers for Broadcom PHYs"
+       depends on PHYLIB
+       ---help---
+         Currently supports the BCM5411, BCM5421 and BCM5461 PHYs.
+
 config FIXED_PHY
        tristate "Drivers for PHY emulation on fixed speed/link"
        depends on PHYLIB
        ---help---
          Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
-         but with the ability to manipulate with speed/link in software. The relavant MII
-         speed/duplex parameters could be effectively handled in user-specified  fuction.
+         but with the ability to manipulate the speed/link in software. The relevant MII
+         speed/duplex parameters could be effectively handled in a user-specified function.
          Currently tested with mpc866ads.
 
 config FIXED_MII_10_FDX