diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 09:19:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-17 09:19:54 -0800 |
| commit | a044a1b147a1c967e1a4b797c3e24c395f3d878a (patch) | |
| tree | 00d5f49c02f178e7312b8fe98f62030d5c3aca51 /arch/arm/mach-pxa/include/mach/entry-macro.S | |
| parent | b1219e24c09c60b903c422861378c3b99bfbbde1 (diff) | |
| parent | 112a674f2f68b17ae253fe7312afc38c3e75be7a (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] pxa: ensure mfp is in correct range in mfp_{read,write}
[ARM] pxa/hx4700: fix hx4700 touchscreen pressure values
ARM: 5787/1: U300 COH 901 331 fixes
ARM: Fix warning in sa1100-flash.c
[ARM] Kirkwood: disable propagation of mbus error to the CPU local bus
[ARM] pxa: fix incorrect mfp_to_gpio() conversion
[ARM] pxa/colibri: fix AC97 ifdefs and add missing include
[ARM] pxa: fix missing underscores in mfp-pxa910.h
[ARM] pxa: fix interrupts number calculation when CONFIG_PXA_HAVE_ISA_IRQS=y
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/entry-macro.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/entry-macro.S b/arch/arm/mach-pxa/include/mach/entry-macro.S index 241880608ac6..a73bc86a3c26 100644 --- a/arch/arm/mach-pxa/include/mach/entry-macro.S +++ b/arch/arm/mach-pxa/include/mach/entry-macro.S @@ -46,5 +46,6 @@ beq 1001f bic \irqstat, \irqstat, #0x80000000 mov \irqnr, \irqstat, lsr #16 + add \irqnr, \irqnr, #(PXA_IRQ(0)) 1001: .endm |