Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for...

[~andy/linux] / arch / mn10300 / mm / misalignment.c

diff --git a/arch/mn10300/mm/misalignment.c b/arch/mn10300/mm/misalignment.c
index eef989c1d0c10baf8614edbd8f87ea09c4d2cf91..f9bb8cb1c14ad0e044320f53efca5431927e8121 100644 (file)
--- a/arch/mn10300/mm/misalignment.c
+++ b/arch/mn10300/mm/misalignment.c
@@ -26,7 +26,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/smp.h>
 #include <asm/pgalloc.h>
 #include <asm/cpu-regs.h>