aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/dma.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-01-02 03:26:33 -0500
committerEric Miao <eric.miao@marvell.com>2009-03-09 09:22:36 -0400
commitfef1f99a0c2928893c074bf3eff27efd36a4532a (patch)
tree9827b349bd741a483fb40eed10a6f382a8b09eb3 /arch/arm/mach-pxa/dma.c
parent51c62982a33d9086fd8876293411d28a5f97247a (diff)
[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)
113 return IRQ_HANDLED; 113 return IRQ_HANDLED;
114} 114}
115 115
116int __init pxa_init_dma(int num_ch) 116int __init pxa_init_dma(int irq, int num_ch)
117{ 117{
118 int i, ret; 118 int i, ret;
119 119
@@ -131,7 +131,7 @@ int __init pxa_init_dma(int num_ch)
131 dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW); 131 dma_channels[i].prio = min((i & 0xf) >> 2, DMA_PRIO_LOW);
132 } 132 }
133 133
134 ret = request_irq(IRQ_DMA, dma_irq_handler, IRQF_DISABLED, "DMA", NULL); 134 ret = request_irq(irq, dma_irq_handler, IRQF_DISABLED, "DMA", NULL);
135 if (ret) { 135 if (ret) {
136 printk (KERN_CRIT "Wow! Can't register IRQ for DMA\n"); 136 printk (KERN_CRIT "Wow! Can't register IRQ for DMA\n");
137 kfree(dma_channels); 137 kfree(dma_channels);