projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xilinx-for-v2017.09' of git://www.denx.de/git/u-boot-microblaze
[oweals/u-boot.git]
/
arch
/
arm
/
include
/
asm
/
assembler.h
diff --git
a/arch/arm/include/asm/assembler.h
b/arch/arm/include/asm/assembler.h
index d24be2d484fe67977257f39e18cf16338f7b1932..b146918586015da8229ac85cd5662d83b927e6fd 100644
(file)
--- a/
arch/arm/include/asm/assembler.h
+++ b/
arch/arm/include/asm/assembler.h
@@
-77,7
+77,7
@@
* We disable it especially for Thumb builds since those instructions
* are not made in a Thumb ready way...
*/
-#if
def CONFIG_SYS_THUMB_BUILD
+#if
CONFIG_IS_ENABLED(SYS_THUMB_BUILD)
#define CALGN(code...)
#else
#define CALGN(code...) code