From aff6b06b6bda3e56ae9c83ea4b23ad9ac3418200 Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Thu, 4 Aug 2011 03:19:45 +0000
Subject: [PATCH] --- yaml --- r: 265192 b: refs/heads/master c:
 bb24fd6ab0e948dc5bddec757b9d5a61362fa3f3 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/ucc_geth.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4e7111df40d4..6dfab55f4216 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ae297b0126fe77ab8223f14d2cfcf187f3244c6
+refs/heads/master: bb24fd6ab0e948dc5bddec757b9d5a61362fa3f3
diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/drivers/net/ucc_geth.c
index d3465ab50e56..42f8e31b0bbb 100644
--- a/trunk/drivers/net/ucc_geth.c
+++ b/trunk/drivers/net/ucc_geth.c
@@ -1761,10 +1761,12 @@ static int init_phy(struct net_device *dev)
 	if (priv->phy_interface == PHY_INTERFACE_MODE_SGMII)
 		uec_configure_serdes(dev);
 
-	phydev->supported &= (ADVERTISED_10baseT_Half |
-				 ADVERTISED_10baseT_Full |
-				 ADVERTISED_100baseT_Half |
-				 ADVERTISED_100baseT_Full);
+	phydev->supported &= (SUPPORTED_MII |
+			      SUPPORTED_Autoneg |
+			      ADVERTISED_10baseT_Half |
+			      ADVERTISED_10baseT_Full |
+			      ADVERTISED_100baseT_Half |
+			      ADVERTISED_100baseT_Full);
 
 	if (priv->max_speed == SPEED_1000)
 		phydev->supported |= ADVERTISED_1000baseT_Full;