From cf462720e04a9ea32b6fd619b4fe4347dc40db66 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 14 Apr 2006 16:00:25 -0700
Subject: [PATCH] --- yaml --- r: 25838 b: refs/heads/master c:
 dcdb02752ff13a64433c36f2937a58d93ae7a19e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 4c2d02fac29c..83a1d3dee001 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e49e76db031fdfaadb4907a319ea3a1dc9d2925f
+refs/heads/master: dcdb02752ff13a64433c36f2937a58d93ae7a19e
diff --git a/trunk/net/atm/clip.c b/trunk/net/atm/clip.c
index 00dddba67c81..49258eed936d 100644
--- a/trunk/net/atm/clip.c
+++ b/trunk/net/atm/clip.c
@@ -976,6 +976,7 @@ static struct file_operations arp_seq_fops = {
 
 static int __init atm_clip_init(void)
 {
+	struct proc_dir_entry *p;
 	neigh_table_init(&clip_tbl);
 
 	clip_tbl_hook = &clip_tbl;
@@ -985,15 +986,9 @@ static int __init atm_clip_init(void)
 
 	setup_timer(&idle_timer, idle_timer_check, 0);
 
-#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
+	p = create_proc_entry("arp", S_IRUGO, atm_proc_root);
+	if (p)
+		p->proc_fops = &arp_seq_fops;
 
 	return 0;
 }