]> Pileus Git - ~andy/linux/blobdiff - arch/arm/mach-cns3xxx/pm.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[~andy/linux] / arch / arm / mach-cns3xxx / pm.c
index 5e579552aa5444fb7189b8df54e09758fd912b56..0c04678615ceade16015442eeefada0ae1623c7d 100644 (file)
@@ -10,7 +10,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/delay.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <mach/system.h>
 #include <mach/cns3xxx.h>
 #include <mach/pm.h>