summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/time.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-09-07 09:19:25 +0200
committerTony Lindgren <tony@atomide.com>2013-10-03 22:24:36 +0200
commitfe806d04d0ed02f87549d2a1a2372e703220b376 (patch)
tree9bcd83a25edf9a026410c658589f8048a09ffa56 /arch/arm/mach-omap1/time.c
parentARM: OMAP2+: throw the die id into the entropy pool (diff)
downloadlinux-fe806d04d0ed02f87549d2a1a2372e703220b376.tar.xz
linux-fe806d04d0ed02f87549d2a1a2372e703220b376.zip
ARM: OMAP: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from OMAP code It's a NOOP since 2.6.35, and will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/time.c')
-rw-r--r--arch/arm/mach-omap1/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 80603d2fef77..6b5f298d6638 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -160,7 +160,7 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id)
static struct irqaction omap_mpu_timer1_irq = {
.name = "mpu_timer1",
- .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = omap_mpu_timer1_interrupt,
};