From 4b32ac8f2546051a8850e76108df00125cddd7b0 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@hera.kernel.org>
Date: Mon, 4 Dec 2006 20:41:19 +0000
Subject: [PATCH] --- yaml --- r: 42074 b: refs/heads/master c:
 a80958f4849316a18c06f75b9e850ccecbf20df8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 253cde669227..60a07ecad59e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c789ff64e874bbece03b607f200566ab24ea9ab
+refs/heads/master: a80958f4849316a18c06f75b9e850ccecbf20df8
diff --git a/trunk/include/linux/kernelcapi.h b/trunk/include/linux/kernelcapi.h
index f8a0ff86dacc..aea34e74c496 100644
--- a/trunk/include/linux/kernelcapi.h
+++ b/trunk/include/linux/kernelcapi.h
@@ -48,6 +48,7 @@ typedef struct kcapi_carddef {
 #include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
+#include <asm/semaphore.h>
 
 #define	KCI_CONTRUP	0	/* arg: struct capi_profile */
 #define	KCI_CONTRDOWN	1	/* arg: NULL */
diff --git a/trunk/include/linux/netfilter.h b/trunk/include/linux/netfilter.h
index 9389cf7d4062..d4c4c5120bc0 100644
--- a/trunk/include/linux/netfilter.h
+++ b/trunk/include/linux/netfilter.h
@@ -11,7 +11,6 @@
 #include <linux/list.h>
 #endif
 #include <linux/compiler.h>
-#include <linux/rcupdate.h>
 
 /* Responses from hook functions. */
 #define NF_DROP 0
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 6bdff9b148d0..a05a5f7c0b73 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -25,6 +25,7 @@
 #include <linux/net.h>
 #include <linux/textsearch.h>
 #include <net/checksum.h>
+#include <linux/rcupdate.h>
 #include <linux/dmaengine.h>
 
 #define HAVE_ALLOC_SKB		/* For the drivers to know */