Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

[mv-sheeva.git] / include / asm-m32r / atomic.h

diff --git a/include/asm-m32r/atomic.h b/include/asm-m32r/atomic.h
index ef1fb8ea4726b0c7b3aea02db8d0fc40d4ee6cdf..70761278b6cb95b1364308b32154c95a37c85dcf 100644 (file)
--- a/include/asm-m32r/atomic.h
+++ b/include/asm-m32r/atomic.h
@@ -313,4 +313,5 @@ static __inline__ void atomic_set_mask(unsigned long  mask, atomic_t *addr)
 #define smp_mb__before_atomic_inc()    barrier()
 #define smp_mb__after_atomic_inc()     barrier()
 
+#include <asm-generic/atomic.h>
 #endif /* _ASM_M32R_ATOMIC_H */