Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

[sfrench/cifs-2.6.git] / include / net / neighbour.h

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index db8e96dd114e0f91d56981a60f27fea7b3644315..0302f31a2fb7e53956f089efac74848fbd15466d 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -258,8 +258,7 @@ extern int                  neigh_sysctl_register(struct net_device *dev,
                                                      struct neigh_parms *p,
                                                      int p_id, int pdev_id,
                                                      char *p_name,
-                                                     proc_handler *proc_handler,
-                                                     ctl_handler *strategy);
+                                                     proc_handler *proc_handler);
 extern void                    neigh_sysctl_unregister(struct neigh_parms *p);
 
 static inline void __neigh_parms_put(struct neigh_parms *parms)