summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-08-31 20:44:09 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2002-08-31 20:44:09 -0700
commitb5b2042ed20c107d7a5058663de04b3ef6ca34b2 (patch)
tree6e8654f842cb0644aab593bdec7c94dd971b908a /include/linux
parentbae9e1dd97a137ba250b3ff6971572ef49ae7af3 (diff)
parent651c8f88d05cc4bee07381849ebd3c11b4d00894 (diff)
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/igmp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 76cf68f03c25..fd28c22a5036 100644
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -115,7 +115,7 @@ extern void ip_mc_init_dev(struct in_device *);
extern void ip_mc_destroy_dev(struct in_device *);
extern void ip_mc_up(struct in_device *);
extern void ip_mc_down(struct in_device *);
-extern int ip_mc_dec_group(struct in_device *in_dev, u32 addr);
+extern void ip_mc_dec_group(struct in_device *in_dev, u32 addr);
extern void ip_mc_inc_group(struct in_device *in_dev, u32 addr);
#endif
#endif