From 8b6028b27f2b6ec16136d0d9e75700ca53ff7811 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Fri, 22 Sep 2006 14:28:11 -0700
Subject: [PATCH] --- yaml --- r: 34690 b: refs/heads/master c:
 69263bcfb5016bc3bdd099607a4232cba06f8491 h: refs/heads/master v: v3

---
 [refs]              |  2 +-
 trunk/net/atm/mpc.c | 11 -----------
 trunk/net/atm/mpc.h |  8 ++++++++
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 3092a1e0b8d4..450077a6f57b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d458c25ce24ce00ea547e9976e293e7835416253
+refs/heads/master: 69263bcfb5016bc3bdd099607a4232cba06f8491
diff --git a/trunk/net/atm/mpc.c b/trunk/net/atm/mpc.c
index 00704661e83f..b87c2a88bdce 100644
--- a/trunk/net/atm/mpc.c
+++ b/trunk/net/atm/mpc.c
@@ -98,11 +98,6 @@ static struct notifier_block mpoa_notifier = {
 	0
 };
 
-#ifdef CONFIG_PROC_FS
-extern int mpc_proc_init(void);
-extern void mpc_proc_clean(void);
-#endif
-
 struct mpoa_client *mpcs = NULL; /* FIXME */
 static struct atm_mpoa_qos *qos_head = NULL;
 static DEFINE_TIMER(mpc_timer, NULL, 0, 0);
@@ -1439,12 +1434,8 @@ static __init int atm_mpoa_init(void)
 {
 	register_atm_ioctl(&atm_ioctl_ops);
 
-#ifdef CONFIG_PROC_FS
 	if (mpc_proc_init() != 0)
 		printk(KERN_INFO "mpoa: failed to initialize /proc/mpoa\n");
-	else
-		printk(KERN_INFO "mpoa: /proc/mpoa initialized\n");
-#endif
 
 	printk("mpc.c: " __DATE__ " " __TIME__ " initialized\n");
 
@@ -1457,9 +1448,7 @@ static void __exit atm_mpoa_cleanup(void)
 	struct atm_mpoa_qos *qos, *nextqos;
 	struct lec_priv *priv;
 
-#ifdef CONFIG_PROC_FS
 	mpc_proc_clean();
-#endif
 
 	del_timer(&mpc_timer);
 	unregister_netdevice_notifier(&mpoa_notifier);
diff --git a/trunk/net/atm/mpc.h b/trunk/net/atm/mpc.h
index 863ddf6079e1..3c7981a229e8 100644
--- a/trunk/net/atm/mpc.h
+++ b/trunk/net/atm/mpc.h
@@ -50,4 +50,12 @@ int atm_mpoa_delete_qos(struct atm_mpoa_qos *qos);
 struct seq_file;
 void atm_mpoa_disp_qos(struct seq_file *m);
 
+#ifdef CONFIG_PROC_FS
+int mpc_proc_init(void);
+void mpc_proc_clean(void);
+#else
+#define mpc_proc_init() (0)
+#define mpc_proc_clean() do { } while(0)
+#endif
+
 #endif /* _MPC_H_ */