diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 17:40:05 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 17:40:05 +0300 |
commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /include/asm-frv/atomic.h | |
parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
download | linux-123656d4cc8c946f578ebd18c2050f5251720428.tar.xz |
Merge with Linus' kernel.
Diffstat (limited to 'include/asm-frv/atomic.h')
-rw-r--r-- | include/asm-frv/atomic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-frv/atomic.h b/include/asm-frv/atomic.h index f6539ff569c5..3f54fea2b051 100644 --- 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 */ |