diff options
| author | Pekka Enberg <penberg@kernel.org> | 2010-10-24 19:57:05 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2010-10-24 19:57:05 +0300 |
| commit | 6d4121f6c20a0e86231d52f535f1c82423b3326f (patch) | |
| tree | 5c235cac699ca86b504850aa663ddadde0455a61 /drivers/net/hamachi.c | |
| parent | 92a5bbc11ff2442a54b2f1d313088c245828ef4e (diff) | |
| parent | 35da7a307c535f9c2929cae277f3df425c9f9b1e (diff) | |
Merge branch 'master' into for-linus
Conflicts:
include/linux/percpu.h
mm/percpu.c
Diffstat (limited to 'drivers/net/hamachi.c')
| -rw-r--r-- | drivers/net/hamachi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 49aac7027fb..9a6485892b3 100644 --- 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; |