From 0b8c03e488d0a5ff989f8d9f757e87cb0f1fd85b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@nuts.ninka.net>
Date: Mon, 20 Oct 2003 08:34:44 -0700
Subject: [PATCH] [LLC]: Make LLC2 compile with PROC_FS=n

---
 include/net/llc.h      |  8 ++++++++
 include/net/llc_proc.h | 18 ------------------
 net/llc/af_llc.c       |  1 -
 net/llc/llc_proc.c     | 11 -----------
 4 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 include/net/llc_proc.h

diff --git a/include/net/llc.h b/include/net/llc.h
index bf3882be35290..c9aed2a8b4e20 100644
--- a/include/net/llc.h
+++ b/include/net/llc.h
@@ -88,4 +88,12 @@ extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
 
 extern int llc_station_init(void);
 extern void llc_station_exit(void);
+
+#ifdef CONFIG_PROC_FS
+extern int llc_proc_init(void);
+extern void llc_proc_exit(void);
+#else
+#define llc_proc_init()	(0)
+#define llc_proc_exit()	do { } while(0)
+#endif /* CONFIG_PROC_FS */
 #endif /* LLC_H */
diff --git a/include/net/llc_proc.h b/include/net/llc_proc.h
deleted file mode 100644
index c6e7306aa8c3d..0000000000000
--- a/include/net/llc_proc.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef LLC_PROC_H
-#define LLC_PROC_H
-/*
- * Copyright (c) 1997 by Procom Technology, Inc.
- * 		 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
- */
-
-extern int llc_proc_init(void);
-extern void llc_proc_exit(void);
-
-#endif /* LLC_PROC_H */
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 693f2a5f457ce..a8c13163e19f4 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -30,7 +30,6 @@
 #include <net/llc_sap.h>
 #include <net/llc_pdu.h>
 #include <net/llc_conn.h>
-#include <net/llc_proc.h>
 
 /* remember: uninitialized global data is zeroed because its in .bss */
 static u16 llc_ui_sap_last_autoport = LLC_SAP_DYN_START;
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 5efc6090e1966..84061d5fb00ee 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -14,7 +14,6 @@
 
 #include <linux/config.h>
 #include <linux/init.h>
-#ifdef CONFIG_PROC_FS
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/errno.h>
@@ -273,13 +272,3 @@ void llc_proc_exit(void)
 	remove_proc_entry("core", llc_proc_dir);
 	remove_proc_entry("llc", proc_net);
 }
-#else /* CONFIG_PROC_FS */
-int __init llc_proc_init(void)
-{
-	return 0;
-}
-
-void llc_proc_exit(void)
-{
-}
-#endif /* CONFIG_PROC_FS */
-- 
2.53.0