diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 08:25:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 08:25:23 -0700 |
| commit | 20a2a811602b16c42ce88bada3d52712cdfb988b (patch) | |
| tree | f2a30a383c47336b0352ed473abafc0cdca4ca2c /arch/arm/kernel/insn.c | |
| parent | a92bc5a65ce966ccc49bc8e37c6714c0b4042818 (diff) | |
| parent | 6d008893e45ad5957a9a31afa00c4c6582504fe5 (diff) | |
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/kernel/insn.c')
| -rw-r--r-- | arch/arm/kernel/insn.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/insn.c b/arch/arm/kernel/insn.c index ab312e51654..b760340b701 100644 --- a/arch/arm/kernel/insn.c +++ b/arch/arm/kernel/insn.c @@ -1,3 +1,4 @@ +#include <linux/bug.h> #include <linux/kernel.h> #include <asm/opcodes.h> |