diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /net/ax25 | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'net/ax25')
| -rw-r--r-- | net/ax25/af_ax25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index f9392fe34..a2ad7111f 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -957,7 +957,7 @@ static int ax25_release(struct socket *sock, struct socket *peer) ax25_stop_t3timer(sk->protinfo.ax25); ax25_stop_idletimer(sk->protinfo.ax25); break; -#ifdef AX25_CONFIG_DAMA_SLAVE +#ifdef CONFIG_AX25_DAMA_SLAVE case AX25_PROTO_DAMA_SLAVE: ax25_stop_t3timer(sk->protinfo.ax25); ax25_stop_idletimer(sk->protinfo.ax25); |