Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-pxa / entry-macro.S

diff --git a/include/asm-arm/arch-pxa/entry-macro.S b/include/asm-arm/arch-pxa/entry-macro.S
index b7e730851461d635f38eff192b9ab6011053f98f..c145bb01bc8fa573a6a1884fc37c9b0aae5bbf6d 100644 (file)
--- 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