diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 09:54:29 +0100 |
commit | cb5fd904f0f14866ab76ec1f6ca3469896e4e2cf (patch) | |
tree | 38b829a0bfe220f8486ab4f771910738c83161be /arch/arm/include/asm/assembler.h | |
parent | 2ff0720933f9a5e502a46fb6ea14ceeaad65131f (diff) | |
parent | f4daf06fc23b99df5ca5b3e892428b91e148cc52 (diff) |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
-rw-r--r-- | arch/arm/include/asm/assembler.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 65c3f2474f5..29035e86a59 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -293,4 +293,13 @@ .macro ldrusr, reg, ptr, inc, cond=al, rept=1, abort=9001f usracc ldr, \reg, \ptr, \inc, \cond, \rept, \abort .endm + +/* Utility macro for declaring string literals */ + .macro string name:req, string + .type \name , #object +\name: + .asciz "\string" + .size \name , . - \name + .endm + #endif /* __ASM_ASSEMBLER_H__ */ |