Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 135e5cfe68a2a3f7f2427556be33fa1a3aefcd00..c600083cbdf50ccc29774d2bd8c8f8cb1ca551ba 100644 (file)
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -25,8 +25,8 @@ enum nfnetlink_groups {
 /* General form of address family dependent message.
  */
 struct nfgenmsg {
-       u_int8_t  nfgen_family;         /* AF_xxx */
-       u_int8_t  version;              /* nfnetlink version */
+       __u8  nfgen_family;             /* AF_xxx */
+       __u8  version;          /* nfnetlink version */
        __be16    res_id;               /* resource id */
 };