Merge branch 'for-3.1-rc1' of git://gitorious.org/linux-omap-dss2/linux

[deliverable/linux.git] / include / linux / jump_label.h

diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index 83e745f3ead76b225d52a92608819c47d8a8c209..66f23dc5e76a636bf2ed54542c6565fc82dbc6a4 100644 (file)
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -54,7 +54,7 @@ extern void jump_label_apply_nops(struct module *mod);
 
 #else
 
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #define JUMP_LABEL_INIT {ATOMIC_INIT(0)}