diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2013-10-17 09:18:38 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-22 07:50:18 -0700 |
| commit | 0bebda684857f76548ea48c8886785198701d8d3 (patch) | |
| tree | 7d882a4ca6dba95cd4b4b5d877399e4683abaaa8 | |
| parent | 6246cd06d81f0310d09f3cc66349d5a943cc4b02 (diff) | |
ARM: OMAP2+: irq, AM33XX add missing register checkomap-for-v3.13/fixes-not-urgent-part2
am33xx has a INTC_PENDING_IRQ3 register that is not checked for pending
interrupts. This patch adds AM33XX to the ifdef of SOCs that have to
check this register.
Cc: stable@vger.kernel.org
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 3926f370448f..e022a869bff2 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -233,7 +233,7 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs goto out; irqnr = readl_relaxed(base_addr + 0xd8); -#ifdef CONFIG_SOC_TI81XX +#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX) if (irqnr) goto out; irqnr = readl_relaxed(base_addr + 0xf8); |