From e06dd279b0cc6a65beca85cdeea428019248b97b Mon Sep 17 00:00:00 2001
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Wed, 28 Nov 2007 22:55:36 +0100
Subject: [PATCH] --- yaml --- r: 78966 b: refs/heads/master c:
 e6a9ea105222ad588d680b5e67dddb02dad3667a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c4e0232b0f92..d070a93ee668 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c3231035d7ec31b3830daebd4c742e0b7471661
+refs/heads/master: e6a9ea105222ad588d680b5e67dddb02dad3667a
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index a106add09fee..71aa4783efd9 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -674,7 +674,7 @@ static void r6040_up(struct net_device *dev)
 static void r6040_timer(unsigned long data)
 {
 	struct net_device *dev = (struct net_device *)data;
-	struct r6040_private *lp = netdev_priv(dev->priv);
+	struct r6040_private *lp = netdev_priv(dev);
 	void __iomem *ioaddr = lp->base;
 	u16 phy_mode;