summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Opdenacker2014-03-04 22:11:56 +0100
committerRussell King2014-03-12 11:32:44 +0100
commit2ed71e7531878b74c0d018891a55ca190a2f1f1b (patch)
tree2edd3e88969120e0bb6662624979c9bde84cff9f
parentARM: 8002/1: spear: remove deprecated IRQF_DISABLED (diff)
downloadkernel-qcow2-linux-2ed71e7531878b74c0d018891a55ca190a2f1f1b.tar.gz
kernel-qcow2-linux-2ed71e7531878b74c0d018891a55ca190a2f1f1b.tar.xz
kernel-qcow2-linux-2ed71e7531878b74c0d018891a55ca190a2f1f1b.zip
ARM: 8003/1: w90x900: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag from arch/arm/mach-w90x900/time.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> Acked-by: Wan zongshun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-w90x900/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c
index 30fbca844575..9230d3725599 100644
--- a/arch/arm/mach-w90x900/time.c
+++ b/arch/arm/mach-w90x900/time.c
@@ -111,7 +111,7 @@ static irqreturn_t nuc900_timer0_interrupt(int irq, void *dev_id)
static struct irqaction nuc900_timer0_irq = {
.name = "nuc900-timer0",
- .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = nuc900_timer0_interrupt,
};