aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/dma.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-02 20:20:05 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 20:29:22 -0400
commit52e405eaa9806968e88b35d65e57acad954a5ab5 (patch)
treeb42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-sa1100/dma.c
parentd061daa0e3abdddc28e21a37c8ac4536dedbf239 (diff)
[PATCH] ARM: fixup irqflags breakage after ARM genirq merge
The irgflags consolidation did conflict with the ARM to generic IRQ conversion and was not applied for ARM. Fix it up. Use the new IRQF_ constants and remove the SA_INTERRUPT define Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/mach-sa1100/dma.c')
-rw-r--r--arch/arm/mach-sa1100/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c
index be0e4427bec7..3c6441d4bc59 100644
--- a/arch/arm/mach-sa1100/dma.c
+++ b/arch/arm/mach-sa1100/dma.c
@@ -124,7 +124,7 @@ int sa1100_request_dma (dma_device_t device, const char *device_id,
124 124
125 i = dma - dma_chan; 125 i = dma - dma_chan;
126 regs = (dma_regs_t *)&DDAR(i); 126 regs = (dma_regs_t *)&DDAR(i);
127 err = request_irq(IRQ_DMA0 + i, dma_irq_handler, SA_INTERRUPT, 127 err = request_irq(IRQ_DMA0 + i, dma_irq_handler, IRQF_DISABLED,
128 device_id, regs); 128 device_id, regs);
129 if (err) { 129 if (err) {
130 printk(KERN_ERR 130 printk(KERN_ERR