Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
[cascardo/linux.git] / include / net / cipso_ipv4.h
index abd4436..3b93874 100644 (file)
@@ -41,7 +41,7 @@
 #include <linux/skbuff.h>
 #include <net/netlabel.h>
 #include <net/request_sock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 /* known doi values */
 #define CIPSO_V4_DOI_UNKNOWN          0x00000000