diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
| commit | 722f2a6c87f34ee0fd0130a8cf45f81e0705594a (patch) | |
| tree | 50b054df34d2731eb0ba0cf1a6c27e43e7eed428 /arch/blackfin/include/asm/atomic.h | |
| parent | 7a0aeb14e18ad59394bd9bbc6e57fb345819e748 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'arch/blackfin/include/asm/atomic.h')
| -rw-r--r-- | arch/blackfin/include/asm/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h index 94b2a9b19451..7bbf44e4ddf9 100644 --- a/arch/blackfin/include/asm/atomic.h +++ b/arch/blackfin/include/asm/atomic.h | |||
| @@ -208,6 +208,6 @@ static inline void atomic_set_mask(unsigned int mask, atomic_t *v) | |||
| 208 | #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) | 208 | #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) |
| 209 | #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) | 209 | #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) |
| 210 | 210 | ||
| 211 | #include <asm-generic/atomic.h> | 211 | #include <asm-generic/atomic-long.h> |
| 212 | 212 | ||
| 213 | #endif /* __ARCH_BLACKFIN_ATOMIC __ */ | 213 | #endif /* __ARCH_BLACKFIN_ATOMIC __ */ |