diff options
| author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-09-04 07:04:39 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-10-21 03:11:05 +0200 |
| commit | 4c1dd3e5edc1619199b4a42618169ac3ac457cb5 (patch) | |
| tree | 8a9f18cef8de7bed8a22ae0d934f30d586462655 /arch/arm/mach-imx/time.c | |
| parent | ARM: imx6sl: config iomux-gpr1 to select clock for fec (diff) | |
| download | linux-4c1dd3e5edc1619199b4a42618169ac3ac457cb5.tar.xz linux-4c1dd3e5edc1619199b4a42618169ac3ac457cb5.zip | |
ARM: imx: remove IRQF_DISABLED
This flag is a NOOP since 2.6.35 and can be removed.
This is an update for 3.11 of a patch already sent for 3.10
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/time.c')
| -rw-r--r-- | arch/arm/mach-imx/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index cd46529e9eaa..9b6638aadeaa 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -250,7 +250,7 @@ static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id) static struct irqaction mxc_timer_irq = { .name = "i.MX Timer Tick", - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, + .flags = IRQF_TIMER | IRQF_IRQPOLL, .handler = mxc_timer_interrupt, }; |