From b2ad5f821b1381492d792ca10b1eb7a107b48f14 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 10 Jan 2001 17:17:53 +0000
Subject: Merge with Linux 2.4.0-prerelease.  Big Makefile rewrite, test your
 Makefiles.

---
 net/ax25/ax25_std_in.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'net/ax25/ax25_std_in.c')

diff --git a/net/ax25/ax25_std_in.c b/net/ax25/ax25_std_in.c
index 1e27580cf..d1cfc3ff9 100644
--- a/net/ax25/ax25_std_in.c
+++ b/net/ax25/ax25_std_in.c
@@ -37,8 +37,6 @@
  *	AX.25 037	Jonathan(G4KLX)	New timer architecture.
  */
 
-#include <linux/config.h>
-#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -467,5 +465,3 @@ int ax25_std_frame_in(ax25_cb *ax25, struct sk_buff *skb, int type)
 
 	return queued;
 }
-
-#endif
-- 
cgit v1.2.3