diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 15:05:40 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-14 15:05:40 +0100 |
| commit | 7822eee1acbbea254212ad69ac99aae7986461da (patch) | |
| tree | d7168d2e23130e3e6c36a731edc29eadd5128fc2 /arch/arm/mach-w90x900/include/mach/entry-macro.S | |
| parent | Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fix... (diff) | |
| parent | scripts/sortextable: silence script output (diff) | |
| download | linux-7822eee1acbbea254212ad69ac99aae7986461da.tar.xz linux-7822eee1acbbea254212ad69ac99aae7986461da.zip | |
Merge branch 'warning-fixes' into next/fixes-non-critical
These are fixes for compiler warnings that for the most
part were introduced during the 3.8 cycle but are otherwise
harmless.
* warning-fixes:
scripts/sortextable: silence script output
ARM: s3c: i2c: add platform_device forward declaration
ARM: mvebu: allow selecting mvebu without Armada XP
ARM: pick Versatile by default for !MMU
ARM: integrator: fix build with INTEGRATOR_AP off
ARM: integrator/versatile: fix NOMMU warnings
ARM: sa1100: don't warn about mach/ide.h
ARM: shmobile: fix defconfig warning on CONFIG_USB
ARM: w90x900: fix legacy assembly syntax
ARM: samsung: fix assembly syntax for new gas
ARM: disable virt_to_bus/virt_to_bus almost everywhere
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-w90x900/include/mach/entry-macro.S')
| -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 |