Pull ec into release branch

[linux-2.6-omap-h63xx.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 0493cb0d61754103f1b67c7fa47cf73b078d15ac..9f29520e8fb0a2514f79a2cf5e34f54c78d4ce7e 100644 (file)
--- a/include/asm-mips/mach-au1x00/au1000_dma.h
+++ b/include/asm-mips/mach-au1x00/au1000_dma.h
@@ -123,7 +123,7 @@ struct dma_chan {
 extern struct dma_chan au1000_dma_table[];
 extern int request_au1000_dma(int dev_id,
                              const char *dev_str,
-                             irqreturn_t (*irqhandler)(int, void *),
+                             irq_handler_t irqhandler,
                              unsigned long irqflags,
                              void *irq_dev_id);
 extern void free_au1000_dma(unsigned int dmanr);