Merge branch 'for-3.1' into for-3.2

[cascardo/linux.git] / include / net / flow.h

diff --git a/include/net/flow.h b/include/net/flow.h
index c6d5fe5..78113da 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -8,7 +8,7 @@
 #define _NET_FLOW_H
 
 #include <linux/in6.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 struct flowi_common {
        int     flowic_oif;