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_iface.c | |
parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/ax25/ax25_iface.c')
-rw-r--r-- | net/ax25/ax25_iface.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ax25/ax25_iface.c b/net/ax25/ax25_iface.c index 2e53ad959..15ca9c453 100644 --- a/net/ax25/ax25_iface.c +++ b/net/ax25/ax25_iface.c @@ -14,7 +14,6 @@ */ #include <linux/config.h> -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE) #include <linux/errno.h> #include <linux/types.h> #include <linux/socket.h> @@ -40,18 +39,18 @@ static struct protocol_struct { struct protocol_struct *next; unsigned int pid; int (*func)(struct sk_buff *, ax25_cb *); -} *protocol_list = NULL; +} *protocol_list; static struct linkfail_struct { struct linkfail_struct *next; void (*func)(ax25_cb *, int); -} *linkfail_list = NULL; +} *linkfail_list; static struct listen_struct { struct listen_struct *next; ax25_address callsign; struct net_device *dev; -} *listen_list = NULL; +} *listen_list; int ax25_protocol_register(unsigned int pid, int (*func)(struct sk_buff *, ax25_cb *)) { @@ -267,4 +266,3 @@ int ax25_protocol_is_registered(unsigned int pid) return 0; } -#endif |