diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:57:30 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:57:30 -0400 |
| commit | dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9 (patch) | |
| tree | 8641efeba632bddfa0e486b41a5f19578b1a1a31 /net/atm/mpc.c | |
| parent | 142e27fc8a3619471669d6241784eec9167c47d1 (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
| download | kernel-crypto-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.tar.gz kernel-crypto-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.tar.xz kernel-crypto-dbaa9a9d2b37d838125fb7f2b9fdc5dc5fa4eaa9.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/atm/mpc.c')
| -rw-r--r-- | net/atm/mpc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 17a81ebe7e6..526d9531411 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c @@ -105,7 +105,7 @@ extern void mpc_proc_clean(void); struct mpoa_client *mpcs = NULL; /* FIXME */ static struct atm_mpoa_qos *qos_head = NULL; -static struct timer_list mpc_timer = TIMER_INITIALIZER(NULL, 0, 0); +static DEFINE_TIMER(mpc_timer, NULL, 0, 0); static struct mpoa_client *find_mpc_by_itfnum(int itf) |