Merge branch 'linus' into core/urgent

[linux-2.6-block.git] / include / linux / filter.h

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 9ee3f9fb0b4a5ee94f23242219ee5ea95cbf1274..741956fa5bfdcc371ab712ade0210fe5de69fe69 100644 (file)
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 
 #ifdef __KERNEL__
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #endif
 
 /*