diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /net/atm | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'net/atm')
| -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 17a81ebe7e6e..526d9531411f 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c | |||
| @@ -105,7 +105,7 @@ extern void mpc_proc_clean(void); | |||
| 105 | 105 | ||
| 106 | struct mpoa_client *mpcs = NULL; /* FIXME */ | 106 | struct mpoa_client *mpcs = NULL; /* FIXME */ |
| 107 | static struct atm_mpoa_qos *qos_head = NULL; | 107 | static struct atm_mpoa_qos *qos_head = NULL; |
| 108 | static struct timer_list mpc_timer = TIMER_INITIALIZER(NULL, 0, 0); | 108 | static DEFINE_TIMER(mpc_timer, NULL, 0, 0); |
| 109 | 109 | ||
| 110 | 110 | ||
| 111 | static struct mpoa_client *find_mpc_by_itfnum(int itf) | 111 | static struct mpoa_client *find_mpc_by_itfnum(int itf) |