projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linus
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-rpc
/
dma.c
diff --git
a/arch/arm/mach-rpc/dma.c
b/arch/arm/mach-rpc/dma.c
index ac511d41d4d75d5a0f078a4c53caac9654e20185..596379a4cf82826fab9bd2f47bf05984ba8ef801 100644
(file)
--- a/
arch/arm/mach-rpc/dma.c
+++ b/
arch/arm/mach-rpc/dma.c
@@
-83,7
+83,7
@@
static void iomd_get_next_sg(struct scatterlist *sg, dma_t *dma)
sg->length |= flags;
}
-static irqreturn_t iomd_dma_handle(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t iomd_dma_handle(int irq, void *dev_id)
{
dma_t *dma = (dma_t *)dev_id;
unsigned long base = dma->dma_base;