diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 16:47:57 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 16:47:57 +0400 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/arm/include/asm/unified.h | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
| download | linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.tar.xz | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/arm/include/asm/unified.h')
| -rw-r--r-- | arch/arm/include/asm/unified.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h index 073e85b9b961..bc631161e9c6 100644 --- a/arch/arm/include/asm/unified.h +++ b/arch/arm/include/asm/unified.h @@ -35,7 +35,9 @@ #define ARM(x...) #define THUMB(x...) x +#ifdef __ASSEMBLY__ #define W(instr) instr.w +#endif #define BSYM(sym) sym + 1 #else /* !CONFIG_THUMB2_KERNEL */ @@ -45,7 +47,9 @@ #define ARM(x...) x #define THUMB(x...) +#ifdef __ASSEMBLY__ #define W(instr) instr +#endif #define BSYM(sym) sym #endif /* CONFIG_THUMB2_KERNEL */ |