From c2f25191c94032063b2794b67de5b998c5611a62 Mon Sep 17 00:00:00 2001
From: Christophe Jaillet <christophe.jaillet@wanadoo.fr>
Date: Thu, 15 May 2008 23:26:22 +0200
Subject: [PATCH] --- yaml --- r: 98095 b: refs/heads/master c:
 208aefa2451cc1f4d87622cb9b2ca4333afa8337 h: refs/heads/master i:   98093:
 17965a24a9f13c75a67dbb1422d4888965dbd9ff   98091:
 c425e6ab91efd9561bb44f0d03b6a52cb7c90c0a   98087:
 1f1af6b09a4456679438df0e7003e8874642acf7   98079:
 a98418a0b2b2cf357018ced8d528d5ba10430c41 v: v3

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

diff --git a/[refs] b/[refs]
index 6a282f8fe3b7..d6a5af990572 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b9835108f68938a5f7e74fd2c0fc65da2abad92
+refs/heads/master: 208aefa2451cc1f4d87622cb9b2ca4333afa8337
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index 169edc154928..858b191517b3 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -733,7 +733,7 @@ static void r6040_timer(unsigned long data)
 	}
 
 	/* Timer active again */
-	mod_timer(&lp->timer, jiffies + round_jiffies(HZ));
+	mod_timer(&lp->timer, round_jiffies(jiffies + HZ));
 }
 
 /* Read/set MAC address routines */