diff options
| author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-12-09 11:22:22 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-11 17:32:41 -0800 |
| commit | ed7936f913456e4c01aed75deba6cfaf830fa8cf (patch) | |
| tree | 8ab2c21da783281996908918616e90fef96b1704 /arch/arm/mach-pxa/time.c | |
| parent | f45913fde00f13f502730809d128e607da2a57c8 (diff) | |
| download | blackbird-op-linux-ed7936f913456e4c01aed75deba6cfaf830fa8cf.tar.gz blackbird-op-linux-ed7936f913456e4c01aed75deba6cfaf830fa8cf.zip | |
ARM: pxa: remove IRQF_DISABLED
This flag is a NOOP since 2.6.35 and can be removed.
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
[olof: Fixed compilation failure for pcm990-baseboard]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
| -rw-r--r-- | arch/arm/mach-pxa/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c index 9aa852a8fab9..5fdc9c4f05be 100644 --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c @@ -137,7 +137,7 @@ static struct clock_event_device ckevt_pxa_osmr0 = { static struct irqaction pxa_ost0_irq = { .name = "ost0", - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, + .flags = IRQF_TIMER | IRQF_IRQPOLL, .handler = pxa_ost0_interrupt, .dev_id = &ckevt_pxa_osmr0, }; |
