summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/trizeps4.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/trizeps4.c
parentf45913fde00f13f502730809d128e607da2a57c8 (diff)
downloadop-kernel-dev-ed7936f913456e4c01aed75deba6cfaf830fa8cf.zip
op-kernel-dev-ed7936f913456e4c01aed75deba6cfaf830fa8cf.tar.gz
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/trizeps4.c')
-rw-r--r--arch/arm/mach-pxa/trizeps4.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index c580434..872dcb2 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -332,8 +332,7 @@ static int trizeps4_mci_init(struct device *dev, irq_handler_t mci_detect_int,
int err;
err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,
- IRQF_DISABLED | IRQF_TRIGGER_RISING,
- "MMC card detect", data);
+ IRQF_TRIGGER_RISING, "MMC card detect", data);
if (err) {
printk(KERN_ERR "trizeps4_mci_init: MMC/SD: can't request"
"MMC card detect IRQ\n");
OpenPOWER on IntegriCloud