Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-frv / atomic.h

diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h
index f6539ff569c5278abece2c6442cbab205dd80311..3f54fea2b051b65570b556891c04d527a94f47e7 100644 (file)
--- a/include/asm-frv/atomic.h
+++ b/include/asm-frv/atomic.h
@@ -426,4 +426,5 @@ extern uint32_t __cmpxchg_32(uint32_t *v, uint32_t test, uint32_t new);
 })
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
 
+#include <asm-generic/atomic.h>
 #endif /* _ASM_ATOMIC_H */