Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxa

[linux-2.6] / drivers / net / r6040.c

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 169edc154928305e154ccba45796b0cd52ec3c92..858b191517b3dfc17800147191d0afe4e3f22b1b 100644 (file)
--- a/drivers/net/r6040.c
+++ b/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 */