From e4a486b1e0e7ec8d4f3fc54abd183911f42bdd11 Mon Sep 17 00:00:00 2001
From: Amos Waterland <apw@us.ibm.com>
Date: Sat, 24 Sep 2005 16:53:16 -0700
Subject: [PATCH] --- yaml --- r: 9295 b: refs/heads/master c:
 45fc3b11f1d419ed6c636e5ca84472d9805f520e h: refs/heads/master i:   9293:
 2186173daeb002391c1fc001fd73a8c2a1baad92   9291:
 7374ca388be6d2bb513e5812ed35263282c70e46   9287:
 03d25e518f2b625da708f1190894db5adb9512c2   9279:
 c80ef7c102496175fa753dc14ef9105c56f53c02 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/neighbour.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff65046f86c5..e0126680fb62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d67b24c40f81823abe5c1eb808bba1038969142b
+refs/heads/master: 45fc3b11f1d419ed6c636e5ca84472d9805f520e
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
index 39fc55edf691..5f160082aafc 100644
--- a/trunk/net/core/neighbour.c
+++ b/trunk/net/core/neighbour.c
@@ -61,7 +61,9 @@ static int pneigh_ifdown(struct neigh_table *tbl, struct net_device *dev);
 void neigh_changeaddr(struct neigh_table *tbl, struct net_device *dev);
 
 static struct neigh_table *neigh_tables;
+#ifdef CONFIG_PROC_FS
 static struct file_operations neigh_stat_seq_fops;
+#endif
 
 /*
    Neighbour hash table buckets are protected with rwlock tbl->lock.