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_route.c | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/ax25/ax25_route.c')
| -rw-r--r-- | net/ax25/ax25_route.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c index 32a7ab515..254ff36fb 100644 --- a/net/ax25/ax25_route.c +++ b/net/ax25/ax25_route.c @@ -41,8 +41,6 @@ * Arnaldo C. Melo s/suser/capable/ */ -#include <linux/config.h> -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) #include <linux/errno.h> #include <linux/types.h> #include <linux/socket.h> @@ -64,8 +62,9 @@ #include <linux/fcntl.h> #include <linux/mm.h> #include <linux/interrupt.h> +#include <linux/init.h> -static ax25_route *ax25_route_list = NULL; +static ax25_route *ax25_route_list; static ax25_route *ax25_find_route(ax25_address *, struct net_device *); @@ -434,12 +433,10 @@ struct sk_buff *ax25_rt_build_path(struct sk_buff *skb, ax25_address *src, ax25_ return skb; } -#ifdef MODULE - /* * Free all memory associated with routing structures. */ -void ax25_rt_free(void) +void __exit ax25_rt_free(void) { ax25_route *s, *ax25_rt = ax25_route_list; @@ -453,7 +450,3 @@ void ax25_rt_free(void) kfree(s); } } - -#endif - -#endif |