summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker <michael@free-electrons.com>2014-03-04 21:56:10 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-03-12 10:32:31 +0000
commit19bd9b286da6f28f4cb04757dd8509a38f9f34d7 (patch)
tree183216a06b3af9c010cd120d530b0cd8d1de8e60
parent57c06a8ed7db71e14a4388590ad258c5b557e557 (diff)
downloadtalos-obmc-linux-19bd9b286da6f28f4cb04757dd8509a38f9f34d7.tar.gz
talos-obmc-linux-19bd9b286da6f28f4cb04757dd8509a38f9f34d7.zip
ARM: 7997/1: cns3xxx: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag from arch/arm/mach-cns3xxx/core.c 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>
-rw-r--r--arch/arm/mach-cns3xxx/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c
index e38b279f402c..384dc859e6c6 100644
--- a/arch/arm/mach-cns3xxx/core.c
+++ b/arch/arm/mach-cns3xxx/core.c
@@ -155,7 +155,7 @@ static irqreturn_t cns3xxx_timer_interrupt(int irq, void *dev_id)
static struct irqaction cns3xxx_timer_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = cns3xxx_timer_interrupt,
};
OpenPOWER on IntegriCloud