diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 18:20:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 18:20:02 -0700 |
| commit | 4f5b1affdda3e0c48cac674182f52004137b0ffc (patch) | |
| tree | 463b738156ee9ddfe7792324e501e523499d1661 /arch/blackfin/include/asm/atomic.h | |
| parent | db1417967959569599da2a4bd0ffb93b17ad795f (diff) | |
| parent | 1762275e7a08e808387999f582430172a02758a5 (diff) | |
| download | linux-4f5b1affdda3e0c48cac674182f52004137b0ffc.tar.gz linux-4f5b1affdda3e0c48cac674182f52004137b0ffc.tar.bz2 linux-4f5b1affdda3e0c48cac674182f52004137b0ffc.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
Pull blackfin updates from Bob Liu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: (24 commits)
blackfin: clean up string bfin_dma_5xx after rename.
blackfin:dma: rename bfin_dma_5xx.c to bfin_dma.c
bf548: ssm2602: Add ssm2602 platform data into bf548 ezkit board file.
Blackfin: s/#if CONFIG/#ifdef CONFIG/
Blackfin: pnav: delete duplicate linux/export.h include
bf561: add ppi DLEN macro for 10bits to 16bits
arch: blackfin: udpate defconfig
Disintegrate asm/system.h for Blackfin [ver #2]
arch/blackfin: don't generate random mac in bfin_get_ether_addr()
Blackfin: wire up new process_vm syscalls
blackfin: cleanup anomaly workarounds
blackfin: update default defconfig
blackfin: thread_info: add suspend flag
bfin: add bfin_ad73311_machine platform device
blackfin: bf537: stamp: update board file for 193x
blackfin: kgdb: skip hardware watchpoint test
bf548: add ppi interrupt mask and blanking clocks
blackfin: bf561: forgot CSYNC in get_core_lock_noflush
spi/bfin_spi: drop bits_per_word from client data
blackfin: cplb-mpu: fix page mask table overflow
...
Diffstat (limited to 'arch/blackfin/include/asm/atomic.h')
| -rw-r--r-- | arch/blackfin/include/asm/atomic.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h index 54c6e2887e9f..c8db653c72d2 100644 --- a/arch/blackfin/include/asm/atomic.h +++ b/arch/blackfin/include/asm/atomic.h @@ -7,6 +7,8 @@ #ifndef __ARCH_BLACKFIN_ATOMIC__ #define __ARCH_BLACKFIN_ATOMIC__ +#include <asm/cmpxchg.h> + #ifdef CONFIG_SMP #include <linux/linkage.h> |