diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:56:43 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 13:56:43 -0700 |
| commit | 5828e87bbcb3ae1c7741cae1c62b44e4979df429 (patch) | |
| tree | 2b678fc60cdeb294435dee64d551cbd03430804d /arch/arm/include/asm | |
| parent | b10049da714e57153cacb7e31efc41a8ba0ae5d2 (diff) | |
| parent | e55d4fa96762fd767a3b6d842c904e994db6bb2e (diff) | |
| download | kernel_samsung_tuna-5828e87bbcb3ae1c7741cae1c62b44e4979df429.zip kernel_samsung_tuna-5828e87bbcb3ae1c7741cae1c62b44e4979df429.tar.gz kernel_samsung_tuna-5828e87bbcb3ae1c7741cae1c62b44e4979df429.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/include/asm')
| -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 */ |