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/netrom/nr_in.c | |
| parent | c9c06167e7933d93a6e396174c68abf242294abb (diff) | |
Merge with Linux 2.4.0-prerelease. Big Makefile rewrite, test your
Makefiles.
Diffstat (limited to 'net/netrom/nr_in.c')
| -rw-r--r-- | net/netrom/nr_in.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index fadf69de8..29762e929 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c @@ -24,8 +24,6 @@ * NET/ROM 007 Jonathan(G4KLX) New timer architecture. */ -#include <linux/config.h> -#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE) #include <linux/errno.h> #include <linux/types.h> #include <linux/socket.h> @@ -304,5 +302,3 @@ int nr_process_rx_frame(struct sock *sk, struct sk_buff *skb) return queued; } - -#endif |