Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / include / linux / igmp.h

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 21dd5690527118b1987c8e24234744c501ca926d..9dbb525c5178d59bef3725ddba461b77342a2c9e 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -30,7 +30,7 @@ struct igmphdr
 {
        __u8 type;
        __u8 code;              /* For newer IGMP */
-       __be16 csum;
+       __sum16 csum;
        __be32 group;
 };
 
@@ -127,6 +127,7 @@ struct igmpv3_query {
 
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <linux/timer.h>
 #include <linux/in.h>
 
 extern int sysctl_igmp_max_memberships;