diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 21:02:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 21:02:11 -0700 |
| commit | accf709b39a9cdbeaf6233000ccb9af966fd691e (patch) | |
| tree | 6b6a034d2d61c4b0f0f3bb59c673dd7b16d19c11 /arch/arm/kernel | |
| parent | 708795cd975579ba7115666f585c428f8cebd572 (diff) | |
| parent | a2a47ca36642e3995e982957bc42678cf11ca6ac (diff) | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
ARM: __io abuse cleanup
ARM: create a common IOMEM definition
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: fix ioremap/iounmap for !CONFIG_MMU
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/debug.S | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 204e2160cfcc..501cdbfc902c 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -10,6 +10,7 @@ * 32-bit debugging code */ #include <linux/linkage.h> +#include <asm/assembler.h> .text diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 22f0ed324f37..395f6271dfc2 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -15,6 +15,7 @@ * that causes it to save wrong values... Be aware! */ +#include <asm/assembler.h> #include <asm/memory.h> #include <asm/glue-df.h> #include <asm/glue-pf.h> |