Merge branch 'regmap-linus' into regmap-next

[karo-tx-linux.git] / include / linux / bit_spinlock.h

diff --git a/include/linux/bit_spinlock.h b/include/linux/bit_spinlock.h
index 564d997e216887f13c18d0b65cfafaf6aba26e71..ac4d9f8b52e9f7c23e7f8e2d8093e896ec451768 100644 (file)
--- a/include/linux/bit_spinlock.h
+++ b/include/linux/bit_spinlock.h
@@ -3,7 +3,7 @@
 
 #include <linux/kernel.h>
 #include <linux/preempt.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 /*
  *  bit-based spin_lock()