Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[pandora-kernel.git] / drivers / net / hamachi.c

diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 49aac70..9a64858 100644 (file)
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -1004,7 +1004,7 @@ static int hamachi_open(struct net_device *dev)
        init_timer(&hmp->timer);
        hmp->timer.expires = RUN_AT((24*HZ)/10);                        /* 2.4 sec. */
        hmp->timer.data = (unsigned long)dev;
-       hmp->timer.function = &hamachi_timer;                           /* timer handler */
+       hmp->timer.function = hamachi_timer;                            /* timer handler */
        add_timer(&hmp->timer);
 
        return 0;