summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/dma.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-01-02 09:26:33 +0100
committerEric Miao <eric.miao@marvell.com>2009-03-09 14:22:36 +0100
commitfef1f99a0c2928893c074bf3eff27efd36a4532a (patch)
tree9827b349bd741a483fb40eed10a6f382a8b09eb3 /arch/arm/mach-pxa/dma.c
parent[ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage (diff)
downloadlinux-fef1f99a0c2928893c074bf3eff27efd36a4532a.tar.xz
linux-fef1f99a0c2928893c074bf3eff27efd36a4532a.zip
[ARM] pxa: allow DMA controller IRQ being specified
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa/dma.c')
-rw-r--r--arch/arm/mach-pxa/dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/dma.c b/arch/arm/mach-pxa/dma.c
index 7de17fc5d54b..4613bf1fe43c 100644
--- a/arch/arm/mach-pxa/dma.c
+++ b/arch/arm/mach-pxa/dma.c
@@ -113,7 +113,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
return IRQ_HANDLED;
}
-int __init pxa_init_dma(int num_ch)
+int __init pxa_init_dma(int irq, int num_ch)
{
int i, ret;
@@ -131,7 +131,7 @@ int __init pxa_init_dma(int num_ch)
dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW);
}
- ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);
+ ret = request_irq(irq, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);
if (ret) {
printk (KERN_CRIT "Wow! Can't register IRQ for DMA\n");
kfree(dma_channels);