summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/em-x270.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-12-09 11:22:22 +0100
committerOlof Johansson <olof@lixom.net>2013-12-11 17:32:41 -0800
commited7936f913456e4c01aed75deba6cfaf830fa8cf (patch)
tree8ab2c21da783281996908918616e90fef96b1704 /arch/arm/mach-pxa/em-x270.c
parentf45913fde00f13f502730809d128e607da2a57c8 (diff)
downloadlinux-ed7936f913456e4c01aed75deba6cfaf830fa8cf.tar.gz
linux-ed7936f913456e4c01aed75deba6cfaf830fa8cf.tar.bz2
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/em-x270.c')
-rw-r--r--arch/arm/mach-pxa/em-x270.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 8eb4e23c561d..6915a9f6b3a3 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -564,8 +564,7 @@ static int em_x270_mci_init(struct device *dev,
}
err = request_irq(gpio_to_irq(mmc_cd), em_x270_detect_int,
- IRQF_DISABLED | IRQF_TRIGGER_RISING |
- IRQF_TRIGGER_FALLING,
+ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"MMC card detect", data);
if (err) {
dev_err(dev, "can't request MMC card detect IRQ: %d\n", err);