Merge branch 'master' of /home/sam/kernel/linux-2.6/

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index a547e47dd5fd..98244d51c154 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -30,7 +30,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
@@ -893,7 +892,7 @@ static void au1xxx_dbdma_init(void)
         #error Unknown Au1x00 SOC
 #endif
 
-        if (request_irq(irq_nr, dbdma_interrupt, SA_INTERRUPT,
+        if (request_irq(irq_nr, dbdma_interrupt, IRQF_DISABLED,
                         "Au1xxx dbdma", (void *)dbdma_gptr))
                 printk("Can't get 1550 dbdma irq");
 }