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-12 02:32:41 +0100 |
commit | ed7936f913456e4c01aed75deba6cfaf830fa8cf (patch) | |
tree | 8ab2c21da783281996908918616e90fef96b1704 /arch/arm/mach-pxa/am300epd.c | |
parent | ARM: clean up cache handling in platform code (diff) | |
download | linux-ed7936f913456e4c01aed75deba6cfaf830fa8cf.tar.xz 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/am300epd.c')
-rw-r--r-- | arch/arm/mach-pxa/am300epd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c index 3dfec1ec462d..c9f309ae88c5 100644 --- a/arch/arm/mach-pxa/am300epd.c +++ b/arch/arm/mach-pxa/am300epd.c @@ -241,8 +241,7 @@ static int am300_setup_irq(struct fb_info *info) struct broadsheetfb_par *par = info->par; ret = request_irq(PXA_GPIO_TO_IRQ(RDY_GPIO_PIN), am300_handle_irq, - IRQF_DISABLED|IRQF_TRIGGER_RISING, - "AM300", par); + IRQF_TRIGGER_RISING, "AM300", par); if (ret) dev_err(&am300_device->dev, "request_irq failed: %d\n", ret); |