Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[karo-tx-linux.git] / net / core / flow.c

diff --git a/net/core/flow.c b/net/core/flow.c
index 990703b8863b4d0bdb29619350e7d4aec01bde17..bf32c33cad3b03268016fa2fee1a6d2756d641d9 100644 (file)
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -22,7 +22,7 @@
 #include <linux/cpumask.h>
 #include <linux/mutex.h>
 #include <net/flow.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <linux/security.h>
 
 struct flow_cache_entry {