Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / arch / arm / mach-sa1100 / dma.c

diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c
index be0e4427bec7ee896e6d669bacc3dd249fa6401d..2ea2a657a0346c06a2bf293814cf7e7ef95079bb 100644 (file)
--- a/arch/arm/mach-sa1100/dma.c
+++ b/arch/arm/mach-sa1100/dma.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/kernel/dma-sa1100.c
+ * arch/arm/mach-sa1100/dma.c
  *
  * Support functions for the SA11x0 internal DMA channels.
  *
@@ -124,7 +124,7 @@ int sa1100_request_dma (dma_device_t device, const char *device_id,
 
        i = dma - dma_chan;
        regs = (dma_regs_t *)&DDAR(i);
-       err = request_irq(IRQ_DMA0 + i, dma_irq_handler, SA_INTERRUPT,
+       err = request_irq(IRQ_DMA0 + i, dma_irq_handler, IRQF_DISABLED,
                          device_id, regs);
        if (err) {
                printk(KERN_ERR