diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /arch/arm/mach-omap2/irq.c | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 9ba20d985dda..998c5c45587e 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
| @@ -73,9 +73,9 @@ static int omap_check_spurious(unsigned int irq) | |||
| 73 | u32 sir, spurious; | 73 | u32 sir, spurious; |
| 74 | 74 | ||
| 75 | sir = intc_bank_read_reg(&irq_banks[0], INTC_SIR); | 75 | sir = intc_bank_read_reg(&irq_banks[0], INTC_SIR); |
| 76 | spurious = sir >> 6; | 76 | spurious = sir >> 7; |
| 77 | 77 | ||
| 78 | if (spurious > 1) { | 78 | if (spurious) { |
| 79 | printk(KERN_WARNING "Spurious irq %i: 0x%08x, please flush " | 79 | printk(KERN_WARNING "Spurious irq %i: 0x%08x, please flush " |
| 80 | "posted write for irq %i\n", | 80 | "posted write for irq %i\n", |
| 81 | irq, sir, previous_irq); | 81 | irq, sir, previous_irq); |