From eda262285076636ce326031215f78a91ba120e71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?fran=C3=A7ois=20romieu?= <romieu@fr.zoreil.com>
Date: Thu, 14 May 2009 11:45:04 +0000
Subject: [PATCH] --- yaml --- r: 150324 b: refs/heads/master c:
 381f05172bdca076390abd84813b09ea423ae8a9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 242212ea5dc3..0cb1dd1c81ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b2d850db275a8934db7e09d79a716435c7b3e0c
+refs/heads/master: 381f05172bdca076390abd84813b09ea423ae8a9
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index c812e16b7ab4..b0573146934b 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -479,7 +479,6 @@ struct rtl8169_private {
 	u16 intr_event;
 	u16 napi_event;
 	u16 intr_mask;
-	int phy_auto_nego_reg;
 	int phy_1000_ctrl_reg;
 #ifdef CONFIG_R8169_VLAN
 	struct vlan_group *vlgrp;
@@ -908,7 +907,6 @@ static int rtl8169_set_speed_xmii(struct net_device *dev,
 		mdio_write(ioaddr, 0x0e, 0x0000);
 	}
 
-	tp->phy_auto_nego_reg = auto_nego;
 	tp->phy_1000_ctrl_reg = giga_ctrl;
 
 	mdio_write(ioaddr, MII_ADVERTISE, auto_nego);