From ed7936f913456e4c01aed75deba6cfaf830fa8cf Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Mon, 9 Dec 2013 11:22:22 +0100 Subject: ARM: pxa: remove IRQF_DISABLED This flag is a NOOP since 2.6.35 and can be removed. Signed-off-by: Michael Opdenacker Acked-by: Eric Miao Signed-off-by: Haojian Zhuang [olof: Fixed compilation failure for pcm990-baseboard] Signed-off-by: Olof Johansson --- arch/arm/mach-pxa/am300epd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/mach-pxa/am300epd.c') diff --git a/arch/arm/mach-pxa/am300epd.c b/arch/arm/mach-pxa/am300epd.c index 3dfec1ec462..c9f309ae88c 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); -- cgit v1.2.3-18-g5258