Merge /spare/repo/netdev-2.6 branch 'ieee80211'

[linux-2.6-omap-h63xx.git] / drivers / net / gianfar_phy.c

diff --git a/drivers/net/gianfar_phy.c b/drivers/net/gianfar_phy.c
index 02b16abc89bdf6225c421e83f7c376822e563560..7c965f268a824a8df57e302d7c7272789ce1691a 100644 (file)
--- a/drivers/net/gianfar_phy.c
+++ b/drivers/net/gianfar_phy.c
@@ -572,7 +572,7 @@ static struct phy_info phy_info_dm9161 = {
 static struct phy_info phy_info_marvell = {
        .phy_id         = 0x01410c00,
        .phy_id_mask    = 0xffffff00,
-       .name           = "Marvell 88E1101",
+       .name           = "Marvell 88E1101/88E1111",
        .features       = MII_GBIT_FEATURES,
        .config_aneg    = &marvell_config_aneg,
        .read_status    = &marvell_read_status,