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.