X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=include%2Fasm-avr32%2Fbitops.h;h=1a50b69b1a192de23bd6bdf88881a5181082faeb;hb=a258860e01b80e8f554a4ab1a6c95e6042eb8b73;hp=5299f8c8e11dc71d99c068d66a2848fb1c73b7f3;hpb=fecf3404f4aba6d0edeba31eeb018cbb6326dff2;p=~andy%2Flinux

diff --git a/include/asm-avr32/bitops.h b/include/asm-avr32/bitops.h
index 5299f8c8e11..1a50b69b1a1 100644
--- a/include/asm-avr32/bitops.h
+++ b/include/asm-avr32/bitops.h
@@ -8,6 +8,10 @@
 #ifndef __ASM_AVR32_BITOPS_H
 #define __ASM_AVR32_BITOPS_H
 
+#ifndef _LINUX_BITOPS_H
+#error only <linux/bitops.h> can be included directly
+#endif
+
 #include <asm/byteorder.h>
 #include <asm/system.h>
 
@@ -288,6 +292,7 @@ static inline int ffs(unsigned long word)
 #include <asm-generic/bitops/fls64.h>
 #include <asm-generic/bitops/sched.h>
 #include <asm-generic/bitops/hweight.h>
+#include <asm-generic/bitops/lock.h>
 
 #include <asm-generic/bitops/ext2-non-atomic.h>
 #include <asm-generic/bitops/ext2-atomic.h>