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_in.c | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/ax25/ax25_in.c')
| -rw-r--r-- | net/ax25/ax25_in.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 6efbc57f2..ed5e6fbce 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -39,7 +39,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> @@ -480,4 +479,3 @@ int ax25_kiss_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_typ return ax25_rcv(skb, dev, (ax25_address *)dev->dev_addr, ptype); } -#endif |