Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[karo-tx-linux.git] / arch / arm / mach-pxa / trizeps4.c

diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index 4ffff9e95eca8578c1c4a63cd33a8aa088af1851..7c3007df1bd6e22be0c009dd796b5cf69bb89f11 100644 (file)
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -283,7 +283,9 @@ static int trizeps4_mci_init(struct device *dev, irqreturn_t (*mci_detect_int)(i
 
        pxa_gpio_mode(GPIO_MMC_DET | GPIO_IN);
 
-       err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int, SA_INTERRUPT | SA_TRIGGER_RISING, "MMC card detect", data);
+       err = request_irq(TRIZEPS4_MMC_IRQ, mci_detect_int,
+                         IRQF_DISABLED | 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");
                return -1;