diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 17:17:53 +0000 |
| commit | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (patch) | |
| tree | 954a648692e7da983db1d2470953705f6a729264 /net/ax25/ax25_ds_timer.c | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/ax25/ax25_ds_timer.c')
| -rw-r--r-- | net/ax25/ax25_ds_timer.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ax25/ax25_ds_timer.c b/net/ax25/ax25_ds_timer.c index 06135e9de..3c5b2ea9c 100644 --- a/net/ax25/ax25_ds_timer.c +++ b/net/ax25/ax25_ds_timer.c @@ -15,8 +15,6 @@ * AX.25 037 Jonathan(G4KLX) New timer architecture. */ -#include <linux/config.h> -#if defined(CONFIG_AX25_DAMA_SLAVE) #include <linux/errno.h> #include <linux/types.h> #include <linux/socket.h> @@ -224,5 +222,3 @@ void ax25_ds_t1_timeout(ax25_cb *ax25) ax25_calculate_t1(ax25); ax25_start_t1timer(ax25); } - -#endif |