From ebe3889048326596cc585bc61fbacd315b3224ee Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 4 May 2006 01:42:36 +0100
Subject: [PATCH] --- yaml --- r: 27995 b: refs/heads/master c:
 8e1515df578e4665b77d1e0eec3c8b041d159b23 h: refs/heads/master i:   27993:
 563b2c4a0f95aabe5207d7d860c7a4cfea4cd02d   27991:
 d4681a2dfc513c3cb4fb45bea3267bce2a044361 v: v3

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

diff --git a/[refs] b/[refs]
index 752b60d18016..5081d77e0a26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56b192c337ddad05dee83c9bea079f41df775990
+refs/heads/master: 8e1515df578e4665b77d1e0eec3c8b041d159b23
diff --git a/trunk/include/linux/netfilter/xt_conntrack.h b/trunk/include/linux/netfilter/xt_conntrack.h
index 34f63cf2e293..4c2d9945ca54 100644
--- a/trunk/include/linux/netfilter/xt_conntrack.h
+++ b/trunk/include/linux/netfilter/xt_conntrack.h
@@ -42,7 +42,7 @@ struct ip_conntrack_old_tuple
 		} u;
 
 		/* The protocol. */
-		u16 protonum;
+		__u16 protonum;
 	} dst;
 };