summaryrefslogtreecommitdiffstats
path: root/include/asm-arm
diff options
context:
space:
mode:
authoreric miao <eric.y.miao@gmail.com>2008-02-27 01:59:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-02-29 22:47:23 +0000
commita3359e21c06cb5b366fb47307b3d2fd23386a774 (patch)
treec092b003f37656736ee50f896d5175c39b30dd3e /include/asm-arm
parent9ae3ae0bebb9a3a348dc233229008b126014889d (diff)
downloadop-kernel-dev-a3359e21c06cb5b366fb47307b3d2fd23386a774.zip
op-kernel-dev-a3359e21c06cb5b366fb47307b3d2fd23386a774.tar.gz
[ARM] 4840/1: pxa: fix the typo in get_irqnr_and_base
This typo causes the incorrect calculation of the IRQ numbers in the ICIP2 registers. Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-pxa/entry-macro.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/entry-macro.S b/include/asm-arm/arch-pxa/entry-macro.S
index b7e7308..c145bb0 100644
--- a/include/asm-arm/arch-pxa/entry-macro.S
+++ b/include/asm-arm/arch-pxa/entry-macro.S
@@ -35,7 +35,7 @@
1004:
mrc p6, 0, \irqstat, c6, c0, 0 @ ICIP2
mrc p6, 0, \irqnr, c7, c0, 0 @ ICMR2
- ands \irqstat, \irqstat, \irqnr
+ ands \irqnr, \irqstat, \irqnr
beq 1003f
rsb \irqstat, \irqnr, #0
and \irqstat, \irqstat, \irqnr
OpenPOWER on IntegriCloud