Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ...

[pandora-kernel.git] / include / linux / icmpv6.h

diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index c0d8357..4c4c74e 100644 (file)
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -174,8 +174,7 @@ struct icmp6_filter {
 
 extern void                            icmpv6_send(struct sk_buff *skb,
                                                    u8 type, u8 code,
-                                                   __u32 info, 
-                                                   struct net_device *dev);
+                                                   __u32 info);
 
 extern int                             icmpv6_init(void);
 extern int                             icmpv6_err_convert(u8 type, u8 code,