---

yaml --- r: 86611 b: refs/heads/master c: a3359e2 h: refs/heads/master i: 86609: 0148d57 86607: 6af230f v: v3
git-mirror · Feb 29, 2008 · f54244e · f54244e
1 parent bc35d47
commit f54244e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ae3ae0bebb9a3a348dc233229008b126014889d
+refs/heads/master: a3359e21c06cb5b366fb47307b3d2fd23386a774
diff --git a/trunk/include/asm-arm/arch-pxa/entry-macro.S b/trunk/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