From 5bbe326402adbfa8758ec3be8ddf3fab770da4b7 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 19 Feb 2008 17:20:33 -0800
Subject: [PATCH] --- yaml --- r: 86276 b: refs/heads/master c:
 7b33ed22194d8f0dbcf682f5cdf5b9c2ef551e7c h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netfilter.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f656a5ca5699..72281d4e90b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27ecb1ff0afa2260e6856c05efd6fedcd0cc76b9
+refs/heads/master: 7b33ed22194d8f0dbcf682f5cdf5b9c2ef551e7c
diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h
index d74e79bacd2d..b74b615492e8 100644
--- a/trunk/include/linux/netfilter.h
+++ b/trunk/include/linux/netfilter.h
@@ -51,7 +51,7 @@ enum nf_inet_hooks {
 };
 
 union nf_inet_addr {
-	u_int32_t	all[4];
+	__u32		all[4];
 	__be32		ip;
 	__be32		ip6[4];
 	struct in_addr	in;