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/netrom/nr_timer.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'net/netrom/nr_timer.c')

diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c
index ac62ad54a..116770434 100644
--- a/net/netrom/nr_timer.c
+++ b/net/netrom/nr_timer.c
@@ -15,8 +15,6 @@
  *					Implemented idle timer.
  */
 
-#include <linux/config.h>
-#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)
 #include <linux/errno.h>
 #include <linux/types.h>
 #include <linux/socket.h>
@@ -245,5 +243,3 @@ static void nr_t1timer_expiry(unsigned long param)
 
 	nr_start_t1timer(sk);
 }
-
-#endif
-- 
cgit v1.2.3