Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel...

[mirror_ubuntu-artful-kernel.git] / include / linux / bit_spinlock.h

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