diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 19:25:23 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 19:25:23 +0400 |
| commit | 20a2a811602b16c42ce88bada3d52712cdfb988b (patch) | |
| tree | f2a30a383c47336b0352ed473abafc0cdca4ca2c /arch/arm/mach-omap2 | |
| parent | a92bc5a65ce966ccc49bc8e37c6714c0b4042818 (diff) | |
| parent | 6d008893e45ad5957a9a31afa00c4c6582504fe5 (diff) | |
| download | linux-20a2a811602b16c42ce88bada3d52712cdfb988b.tar.xz | |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Nothing too big here, just small fixes."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM)
ARM: fix bios32.c build warning
ARM: 7337/1: ptrace: fix ptrace_read_user for !CONFIG_MMU platforms
ARM: fix missing bug.h include in arch/arm/kernel/insn.c
ARM: sa11x0: fix build errors from DMA engine API updates
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/barriers.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/include/mach/barriers.h b/arch/arm/mach-omap2/include/mach/barriers.h index 4fa72c7cc7cd..1c582a8592b9 100644 --- a/arch/arm/mach-omap2/include/mach/barriers.h +++ b/arch/arm/mach-omap2/include/mach/barriers.h @@ -22,6 +22,8 @@ #ifndef __MACH_BARRIERS_H #define __MACH_BARRIERS_H +#include <asm/outercache.h> + extern void omap_bus_sync(void); #define rmb() dsb() |