aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlabel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-15 15:10:12 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-15 15:10:12 -0400
commit6c9fcaf2eec1b9f85226a694230dd957dd7926b3 (patch)
treef8c824c6c64dc411752c844f116e693760768bcc /net/netlabel
parentb9d2252c1e44fa83a4e65fdc9eb93db6297c55af (diff)
parent199a952876adbfc2b6c13b8b07adabebf4ff54b2 (diff)
Merge branch 'core/rcu' into core/rcu-for-linus
Diffstat (limited to 'net/netlabel')
-rw-r--r--net/netlabel/netlabel_domainhash.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netlabel/netlabel_domainhash.c b/net/netlabel/netlabel_domainhash.c
index 02c2f7c0b255..643c032a3a57 100644
--- a/net/netlabel/netlabel_domainhash.c
+++ b/net/netlabel/netlabel_domainhash.c
@@ -30,8 +30,7 @@
30 */ 30 */
31 31
32#include <linux/types.h> 32#include <linux/types.h>
33#include <linux/rcupdate.h> 33#include <linux/rculist.h>
34#include <linux/list.h>
35#include <linux/skbuff.h> 34#include <linux/skbuff.h>
36#include <linux/spinlock.h> 35#include <linux/spinlock.h>
37#include <linux/string.h> 36#include <linux/string.h>