diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-29 17:34:54 (GMT) |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-29 17:34:54 (GMT) |
| commit | 8eb2c0ee67f4853c0e433394f65ef8143a748c80 (patch) | |
| tree | ea74ea0878b2f07eb70f2d5b42be5ec42f3bdb5f /arch/arm/include | |
| parent | 3e0dc6b01f5301d63046f6deddde2c7f5c57d67a (diff) | |
| parent | 0d72c6fcb5cd215eeab824fac216ea42c5b574aa (diff) | |
| download | linux-fsl-qoriq-8eb2c0ee67f4853c0e433394f65ef8143a748c80.tar.xz | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/entry-macro-multi.S | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index bc2d2d7..65c3f24 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -13,6 +13,9 @@ * Do not include any C declarations in this file - it is included by * assembler source. */ +#ifndef __ASM_ASSEMBLER_H__ +#define __ASM_ASSEMBLER_H__ + #ifndef __ASSEMBLY__ #error "Only include this from assembly code" #endif @@ -290,3 +293,4 @@ .macro ldrusr, reg, ptr, inc, cond=al, rept=1, abort=9001f usracc ldr, \reg, \ptr, \inc, \cond, \rept, \abort .endm +#endif /* __ASM_ASSEMBLER_H__ */ diff --git a/arch/arm/include/asm/entry-macro-multi.S b/arch/arm/include/asm/entry-macro-multi.S index ec0bbf7..2da8547 100644 --- a/arch/arm/include/asm/entry-macro-multi.S +++ b/arch/arm/include/asm/entry-macro-multi.S @@ -1,3 +1,5 @@ +#include <asm/assembler.h> + /* * Interrupt handling. Preserves r7, r8, r9 */ |