Merge branch 'master' into upstream

[linux-2.6] / include / net / arp.h

diff --git a/include/net/arp.h b/include/net/arp.h
index a1f09fad6a52e57070d6a27ade661339bfc449c6..643bded9f557b5556ea159515b7915cf9016484d 100644 (file)
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -10,8 +10,6 @@
 extern struct neigh_table arp_tbl;
 
 extern void    arp_init(void);
-extern int     arp_rcv(struct sk_buff *skb, struct net_device *dev,
-                       struct packet_type *pt);
 extern int     arp_find(unsigned char *haddr, struct sk_buff *skb);
 extern int     arp_ioctl(unsigned int cmd, void __user *arg);
 extern void     arp_send(int type, int ptype, u32 dest_ip,