diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-02 20:20:05 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 20:29:22 -0400 |
commit | 52e405eaa9806968e88b35d65e57acad954a5ab5 (patch) | |
tree | b42e2d50c4f9d1b00baf5a8b54309ffdf1950456 /arch/arm/mach-s3c2410/dma.c | |
parent | d061daa0e3abdddc28e21a37c8ac4536dedbf239 (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-s3c2410/dma.c')
-rw-r--r-- | arch/arm/mach-s3c2410/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/dma.c b/arch/arm/mach-s3c2410/dma.c index b0aaf4328732..094cc52745c5 100644 --- a/arch/arm/mach-s3c2410/dma.c +++ b/arch/arm/mach-s3c2410/dma.c | |||
@@ -718,7 +718,7 @@ int s3c2410_dma_request(unsigned int channel, s3c2410_dma_client_t *client, | |||
718 | pr_debug("dma%d: %s : requesting irq %d\n", | 718 | pr_debug("dma%d: %s : requesting irq %d\n", |
719 | channel, __FUNCTION__, chan->irq); | 719 | channel, __FUNCTION__, chan->irq); |
720 | 720 | ||
721 | err = request_irq(chan->irq, s3c2410_dma_irq, SA_INTERRUPT, | 721 | err = request_irq(chan->irq, s3c2410_dma_irq, IRQF_DISABLED, |
722 | client->name, (void *)chan); | 722 | client->name, (void *)chan); |
723 | 723 | ||
724 | if (err) { | 724 | if (err) { |