Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6-omap-h63xx.git] / arch / cris / arch-v32 / kernel / arbiter.c

diff --git a/arch/cris/arch-v32/kernel/arbiter.c b/arch/cris/arch-v32/kernel/arbiter.c
index 82d44c9afc1ecc2c8049606b6bdca175b324cc74..420a5312ed039ff451e73939a7dc25ddaf5a5859 100644 (file)
--- a/arch/cris/arch-v32/kernel/arbiter.c
+++ b/arch/cris/arch-v32/kernel/arbiter.c
@@ -119,7 +119,7 @@ static void crisv32_arbiter_init(void)
         crisv32_arbiter_config(EXT_REGION);
         crisv32_arbiter_config(INT_REGION);
 
-       if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, SA_INTERRUPT,
+       if (request_irq(MEMARB_INTR_VECT, crisv32_arbiter_irq, IRQF_DISABLED,
                         "arbiter", NULL))
                printk(KERN_ERR "Couldn't allocate arbiter IRQ\n");