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]
/
include
/
asm-mips
/
mach-au1x00
/
au1000_dma.h
diff --git
a/include/asm-mips/mach-au1x00/au1000_dma.h
b/include/asm-mips/mach-au1x00/au1000_dma.h
index
810f2fa
..
9f29520
100644
(file)
--- a/
include/asm-mips/mach-au1x00/au1000_dma.h
+++ b/
include/asm-mips/mach-au1x00/au1000_dma.h
@@
-123,8
+123,7
@@
struct dma_chan {
extern struct dma_chan au1000_dma_table[];
extern int request_au1000_dma(int dev_id,
const char *dev_str,
extern struct dma_chan au1000_dma_table[];
extern int request_au1000_dma(int dev_id,
const char *dev_str,
- irqreturn_t (*irqhandler)(int, void *,
- struct pt_regs *),
+ irq_handler_t irqhandler,
unsigned long irqflags,
void *irq_dev_id);
extern void free_au1000_dma(unsigned int dmanr);
unsigned long irqflags,
void *irq_dev_id);
extern void free_au1000_dma(unsigned int dmanr);