diff options
| author | Tom Rini <trini@ti.com> | 2014-11-07 20:35:20 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-10 16:25:28 -0500 |
| commit | 2db8c2d61a05bb4a94bb341329c6de811757c111 (patch) | |
| tree | f173c3f8c58de371d3e002cd36ca263fac03542d /arch/arm/include/asm | |
| parent | e72be8947e129f5ab274c0a9f235d2cc0014b2ea (diff) | |
| parent | 59a9cfdd16ad7ab14f22697bf1e049c6bea0d3e2 (diff) | |
| download | blackbird-obmc-uboot-2db8c2d61a05bb4a94bb341329c6de811757c111.tar.gz blackbird-obmc-uboot-2db8c2d61a05bb4a94bb341329c6de811757c111.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/macro.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h index 541b443254..1c8c4251ee 100644 --- a/arch/arm/include/asm/macro.h +++ b/arch/arm/include/asm/macro.h @@ -193,7 +193,7 @@ lr .req x30 0 : wfi ldr \wreg2, [\xreg1, GICC_AIAR] str \wreg2, [\xreg1, GICC_AEOIR] - and \wreg2, \wreg2, #3ff + and \wreg2, \wreg2, #0x3ff cbnz \wreg2, 0b .endm #endif |
