[GFS2] Fix up merge of Linus' kernel into GFS2

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

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 28f4f3b36950593a5eec787ce7193cb207bf9be8..899c3d4776f3dffc690274bd3dfb44224c6608ab 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -169,7 +169,7 @@ struct ip_sf_list
 struct ip_mc_list
 {
        struct in_device        *interface;
-       unsigned long           multiaddr;
+       __be32                  multiaddr;
        struct ip_sf_list       *sources;
        struct ip_sf_list       *tomb;
        unsigned int            sfmode;