git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
mips
/
au1000
/
common
/
dma.c
diff --git
a/arch/mips/au1000/common/dma.c
b/arch/mips/au1000/common/dma.c
index
fb7c47c
..
c78260d
100644
(file)
--- a/
arch/mips/au1000/common/dma.c
+++ b/
arch/mips/au1000/common/dma.c
@@
-160,7
+160,7
@@
void dump_au1000_dma_channel(unsigned int dmanr)
* Requests the DMA done IRQ if irqhandler != NULL.
*/
int request_au1000_dma(int dev_id, const char *dev_str,
- irq
return_t (*irqhandler)(int, void *, struct pt_regs *)
,
+ irq
_handler_t irqhandler
,
unsigned long irqflags,
void *irq_dev_id)
{