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_uid.c | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/ax25/ax25_uid.c')
| -rw-r--r-- | net/ax25/ax25_uid.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c index eb226b14c..603d8b8cc 100644 --- a/net/ax25/ax25_uid.c +++ b/net/ax25/ax25_uid.c @@ -13,8 +13,6 @@ * AX.25 036 Jonathan(G4KLX) Split from af_ax25.c. */ -#include <linux/config.h> -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) #include <linux/errno.h> #include <linux/types.h> #include <linux/socket.h> @@ -48,7 +46,7 @@ * Callsign/UID mapper. This is in kernel space for security on multi-amateur machines. */ -static ax25_uid_assoc *ax25_uid_list = NULL; +static ax25_uid_assoc *ax25_uid_list; int ax25_uid_policy = 0; @@ -164,12 +162,10 @@ int ax25_uid_get_info(char *buffer, char **start, off_t offset, int length) return len; } -#ifdef MODULE - /* * Free all memory associated with UID/Callsign structures. */ -void ax25_uid_free(void) +void __exit ax25_uid_free(void) { ax25_uid_assoc *s, *ax25_uid = ax25_uid_list; @@ -180,7 +176,3 @@ void ax25_uid_free(void) kfree(s); } } - -#endif - -#endif |