From d1b4a34cdb02f853af3f3ced5f43c55dbcb9da35 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Wed, 19 Sep 2007 15:36:43 -0700
Subject: [PATCH] --- yaml --- r: 65071 b: refs/heads/master c:
 c99210b50fe741026d86fdcb5f3f5a0c00c503cc h: refs/heads/master i:   65069:
 98928020e6ad129c8d3cf4cfffcf2feceacaaf26   65067:
 d64b56f8b71c295c250164e5402650817dbb4487   65063:
 cce66bbf9fb801f7ebea266077d3efede4ce3117   65055:
 ffafd8dc883605a269cb89985ab36911f7b8c638 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/sky2.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f2dc3025de66..866ee0488012 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6532232cd3de79c852685823a9c52f723816d0a
+refs/heads/master: c99210b50fe741026d86fdcb5f3f5a0c00c503cc
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 8b1565453f08..94552cc4c462 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -2841,13 +2841,6 @@ static int sky2_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 	ecmd->supported = sky2_supported_modes(hw);
 	ecmd->phy_address = PHY_ADDR_MARV;
 	if (sky2_is_copper(hw)) {
-		ecmd->supported = SUPPORTED_10baseT_Half
-		    | SUPPORTED_10baseT_Full
-		    | SUPPORTED_100baseT_Half
-		    | SUPPORTED_100baseT_Full
-		    | SUPPORTED_1000baseT_Half
-		    | SUPPORTED_1000baseT_Full
-		    | SUPPORTED_Autoneg | SUPPORTED_TP;
 		ecmd->port = PORT_TP;
 		ecmd->speed = sky2->speed;
 	} else {