diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-17 07:46:06 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-17 07:46:06 +0100 |
| commit | 8b0f6d12de91345190f234edba781b2fd03257b6 (patch) | |
| tree | 4b6015433a0ffe5fc7ff9115014e3da580581f4b /arch/arm/include | |
| parent | Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm i... (diff) | |
| parent | ARM: make BSYM macro assembly only (diff) | |
| download | linux-8b0f6d12de91345190f234edba781b2fd03257b6.tar.xz linux-8b0f6d12de91345190f234edba781b2fd03257b6.zip | |
Merge branch 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux into fixes
* 'fixes-for-arm-soc' of git://sources.calxeda.com/kernel/linux:
ARM: make BSYM macro assembly only
ARM: highbank: remove incorrect BSYM usage
ARM: imx: remove incorrect BSYM usage
ARM: exynos: remove incorrect BSYM usage
ARM: ux500: add missing ENDPROC to headsmp.S
ARM: msm: Add missing ENDPROC to headsmp.S
ARM: versatile: Add missing ENDPROC to headsmp.S
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/unified.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/unified.h b/arch/arm/include/asm/unified.h index bc631161e9c6..f5989f46b4d2 100644 --- a/arch/arm/include/asm/unified.h +++ b/arch/arm/include/asm/unified.h @@ -37,8 +37,8 @@ #define THUMB(x...) x #ifdef __ASSEMBLY__ #define W(instr) instr.w -#endif #define BSYM(sym) sym + 1 +#endif #else /* !CONFIG_THUMB2_KERNEL */ @@ -49,8 +49,8 @@ #define THUMB(x...) #ifdef __ASSEMBLY__ #define W(instr) instr -#endif #define BSYM(sym) sym +#endif #endif /* CONFIG_THUMB2_KERNEL */ |