Merge branch 'wm8996-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / arch / blackfin / kernel / ftrace.c

diff --git a/arch/blackfin/kernel/ftrace.c b/arch/blackfin/kernel/ftrace.c
index 48808a12b4279f909ddf2afa404f0778a776c309..9277905b82cf27efacef0cf5f83bc00af838d7db 100644 (file)
--- a/arch/blackfin/kernel/ftrace.c
+++ b/arch/blackfin/kernel/ftrace.c
@@ -9,7 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/uaccess.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/cacheflush.h>
 
 #ifdef CONFIG_DYNAMIC_FTRACE