summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/common.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael@free-electrons.com>2014-03-04 21:59:03 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-03-12 10:32:33 +0000
commit1ee6564d72ce718bf4e50d5684aa98d9d895f859 (patch)
tree48604cb661d2f025e5e2b1d190b6de708621fc9b /arch/arm/mach-ixp4xx/common.c
parent19bd9b286da6f28f4cb04757dd8509a38f9f34d7 (diff)
downloadlinux-1ee6564d72ce718bf4e50d5684aa98d9d895f859.tar.gz
linux-1ee6564d72ce718bf4e50d5684aa98d9d895f859.tar.bz2
linux-1ee6564d72ce718bf4e50d5684aa98d9d895f859.zip
ARM: 7998/1: IXP4xx: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag from code in arch/arm/mach-ixp4xx It's a NOOP since 2.6.35 and it will be removed one day. 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-ixp4xx/common.c')
-rw-r--r--arch/arm/mach-ixp4xx/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 6d68aed6548a..a465f27bc263 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -312,7 +312,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id)
static struct irqaction ixp4xx_timer_irq = {
.name = "timer1",
- .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = ixp4xx_timer_interrupt,
.dev_id = &clockevent_ixp4xx,
};