diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-17 21:27:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-17 21:27:22 +0100 |
| commit | b4aa9e05a61b845541fa6f5b1d246976922601f0 (patch) | |
| tree | ca94478c3df281ab76a3399f5ba6341ade3f5791 /drivers/net/phy/Kconfig | |
| parent | qlcnic: reset pci function unconditionally during probe (diff) | |
| parent | netlink: fix gcc -Wconversion compilation warning (diff) | |
| download | linux-b4aa9e05a61b845541fa6f5b1d246976922601f0.tar.xz linux-b4aa9e05a61b845541fa6f5b1d246976922601f0.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c
Diffstat (limited to 'drivers/net/phy/Kconfig')
| -rw-r--r-- | drivers/net/phy/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index cb3d13e4e074..35fda5ac8120 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -64,7 +64,7 @@ config BCM63XX_PHY config ICPLUS_PHY tristate "Drivers for ICPlus PHYs" ---help--- - Currently supports the IP175C PHY. + Currently supports the IP175C and IP1001 PHYs. config REALTEK_PHY tristate "Drivers for Realtek PHYs" |