Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h
index 34f63cf2e2932a4c56cef8eadd8343e385a0d6f0..4c2d9945ca54a50034d488ce8e472e404bafed9b 100644 (file)
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
@@ -42,7 +42,7 @@ struct ip_conntrack_old_tuple
                } u;
 
                /* The protocol. */
-               u16 protonum;
+               __u16 protonum;
        } dst;
 };