diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 18:21:16 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 18:21:16 +0400 |
| commit | f5b8fcb48b9eb1a02f6a3a679da913f6c467527c (patch) | |
| tree | 4e67c46f5ebc0acf8c29ce01c711b84352a617f3 /arch/blackfin/include/asm/bitops.h | |
| parent | a1f0bcccffe508b36f8eb0bd39771d4bedc683a8 (diff) | |
| parent | 5ae89ee043ce96e3790e6c75f3807c8e37d98634 (diff) | |
| download | linux-f5b8fcb48b9eb1a02f6a3a679da913f6c467527c.tar.xz | |
Merge tag 'for-linus' of git://github.com/realmz/blackfin-linux
Pull blackfin updates from Steven Miao.
* tag 'for-linus' of git://github.com/realmz/blackfin-linux:
bfin cache: dcplb map: add 16M dcplb map for BF60x
blackfin: smp: fix smp build after drop asm/system.h
blackfin: fix bootup core clock and system clock display
Platform Nand: Set the GPIO for NAND read as input
blackfin: rename vmImage to uImage after we move to buildroot
blackfin: twi: Remove bogus #endif
bf609: rsi: Add bf609 rsi MMR macro and board platform data.
blackfin: dmc: Improve DDR2 write through in DMC effict controller.
Diffstat (limited to 'arch/blackfin/include/asm/bitops.h')
| -rw-r--r-- | arch/blackfin/include/asm/bitops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/bitops.h b/arch/blackfin/include/asm/bitops.h index 8a0fed16058f..0ca40dd44724 100644 --- a/arch/blackfin/include/asm/bitops.h +++ b/arch/blackfin/include/asm/bitops.h @@ -41,6 +41,7 @@ #include <asm-generic/bitops/non-atomic.h> #else +#include <asm/barrier.h> #include <asm/byteorder.h> /* swab32 */ #include <linux/linkage.h> |