Merge branch 'fsnotify' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[karo-tx-linux.git] / drivers / isdn / hisax / isdnl3.c

diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c
index c754706f83cdc190ca18e299896590430e7b9824..569ce52c567b2beb9f42097bebe88af025d6dbed 100644 (file)
--- a/drivers/isdn/hisax/isdnl3.c
+++ b/drivers/isdn/hisax/isdnl3.c
@@ -169,9 +169,7 @@ void
 L3InitTimer(struct l3_process *pc, struct L3Timer *t)
 {
        t->pc = pc;
-       t->tl.function = (void *) L3ExpireTimer;
-       t->tl.data = (long) t;
-       init_timer(&t->tl);
+       setup_timer(&t->tl, (void *)L3ExpireTimer, (long)t);
 }
 
 void