From 9f3d978309c1665de2f7cf0c9d43885d92b8a2c4 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sun, 9 Jul 2006 12:13:18 -0700
Subject: [PATCH] --- yaml --- r: 32201 b: refs/heads/master c:
 24781734643ea2e9fd864f58000e47793e2dcb04 h: refs/heads/master i:   32199:
 0d52717e244c1f27779e3d1ff166a92bcca69a87 v: v3

---
 [refs]               |  2 +-
 trunk/net/atm/clip.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index aa5e66baf508..1af35c8cb015 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebbaeab18b1c520054ea70e512ac0db7456ede01
+refs/heads/master: 24781734643ea2e9fd864f58000e47793e2dcb04
diff --git a/trunk/net/atm/clip.c b/trunk/net/atm/clip.c
index 121bf6f49148..2e62105d91bd 100644
--- a/trunk/net/atm/clip.c
+++ b/trunk/net/atm/clip.c
@@ -962,7 +962,6 @@ static struct file_operations arp_seq_fops = {
 
 static int __init atm_clip_init(void)
 {
-	struct proc_dir_entry *p;
 	neigh_table_init_no_netlink(&clip_tbl);
 
 	clip_tbl_hook = &clip_tbl;
@@ -972,9 +971,15 @@ static int __init atm_clip_init(void)
 
 	setup_timer(&idle_timer, idle_timer_check, 0);
 
-	p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
-	if (p)
-		p->proc_fops = &arp_seq_fops;
+#ifdef CONFIG_PROC_FS
+	{
+		struct proc_dir_entry *p;
+
+		p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
+		if (p)
+			p->proc_fops = &arp_seq_fops;
+	}
+#endif
 
 	return 0;
 }