diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-01-14 12:49:02 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 15:04:35 +0100 |
| commit | fa5ce5f94c0f2bfa41ba68d2d2524298e1fc405e (patch) | |
| tree | abc2ae78c4c9e7cd871e72db617b2ed1a96b7be8 /arch/arm/mach-w90x900 | |
| parent | 2815774bb38445006074e16251b9ef5123bdc616 (diff) | |
| download | lwn-fa5ce5f94c0f2bfa41ba68d2d2524298e1fc405e.tar.gz lwn-fa5ce5f94c0f2bfa41ba68d2d2524298e1fc405e.zip | |
ARM: w90x900: fix legacy assembly syntax
New ARM binutils don't allow extraneous whitespace inside
of brackets, which causes this error on all mach-w90x900
defconfigs:
arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r0,[ r6,#(0x10C)]'
arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r0,[ r6,#(0x110)]'
arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r0,[ r6,#(0x10C)]'
arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r0,[ r6,#(0x110)]'
This removes the whitespace in order to build the kernel
again.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Diffstat (limited to 'arch/arm/mach-w90x900')
| -rw-r--r-- | arch/arm/mach-w90x900/include/mach/entry-macro.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-w90x900/include/mach/entry-macro.S b/arch/arm/mach-w90x900/include/mach/entry-macro.S index e286daca6827..0ff612ac95ba 100644 --- a/arch/arm/mach-w90x900/include/mach/entry-macro.S +++ b/arch/arm/mach-w90x900/include/mach/entry-macro.S @@ -19,8 +19,8 @@ mov \base, #AIC_BA - ldr \irqnr, [ \base, #AIC_IPER] - ldr \irqnr, [ \base, #AIC_ISNR] + ldr \irqnr, [\base, #AIC_IPER] + ldr \irqnr, [\base, #AIC_ISNR] cmp \irqnr, #0 .endm |