Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-2.6] / net / core / flow.c

diff --git a/net/core/flow.c b/net/core/flow.c
index a77531c139b7d85dbb6f11297d7cea363acd7074..19991175fdeb4bca0f2e357ae7dfa5545dc72371 100644 (file)
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -23,7 +23,6 @@
 #include <linux/mutex.h>
 #include <net/flow.h>
 #include <asm/atomic.h>
-#include <asm/semaphore.h>
 #include <linux/security.h>
 
 struct flow_cache_entry {