summaryrefslogtreecommitdiff
path: root/arch/arm/mach-footbridge/dc21285-timer.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael@free-electrons.com>2014-03-04 21:45:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-03-12 10:32:27 +0000
commit26632becc3c126599567d7fec69c9d91cf3dc124 (patch)
tree13762b29283ab01969a2389d75da9f5718008fa1 /arch/arm/mach-footbridge/dc21285-timer.c
parentfec510141088ca1f15d1b79f9f6838810d668b77 (diff)
ARM: 7995/1: footbridge: remove obsolete IRQF_DISABLED
This patch removes the IRQF_DISABLED flag from footbridge code. It's a NOOP since 2.6.35. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-footbridge/dc21285-timer.c')
-rw-r--r--arch/arm/mach-footbridge/dc21285-timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c
index 5d2725fd878c..bf7aa7d298e7 100644
--- a/arch/arm/mach-footbridge/dc21285-timer.c
+++ b/arch/arm/mach-footbridge/dc21285-timer.c
@@ -105,7 +105,7 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id)
static struct irqaction footbridge_timer_irq = {
.name = "dc21285_timer1",
.handler = timer1_interrupt,
- .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.dev_id = &ckevt_dc21285,
};