summaryrefslogtreecommitdiff
path: root/drivers/usb/musb/cppi_dma.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-04-21 13:33:43 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-04-21 13:33:43 +1000
commit1d84f6ce3c182240af9877494713157d0b6affb2 (patch)
tree50d42d921cfec4bf5b0bd3ec41afd625ad25e290 /drivers/usb/musb/cppi_dma.h
parent1d64eda1c78adb4b3a29779c3ba70e508e20e97b (diff)
parentad23a5f7b4f17cec0c2271c26d07d93998956be6 (diff)
Merge branch 'quilt/usb'
Diffstat (limited to 'drivers/usb/musb/cppi_dma.h')
-rw-r--r--drivers/usb/musb/cppi_dma.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/usb/musb/cppi_dma.h b/drivers/usb/musb/cppi_dma.h
index 729b4071787b..8a39de3e6e47 100644
--- a/drivers/usb/musb/cppi_dma.h
+++ b/drivers/usb/musb/cppi_dma.h
@@ -119,6 +119,8 @@ struct cppi {
void __iomem *mregs; /* Mentor regs */
void __iomem *tibase; /* TI/CPPI regs */
+ int irq;
+
struct cppi_channel tx[4];
struct cppi_channel rx[4];
@@ -127,7 +129,7 @@ struct cppi {
struct list_head tx_complete;
};
-/* irq handling hook */
-extern void cppi_completion(struct musb *, u32 rx, u32 tx);
+/* CPPI IRQ handler */
+extern irqreturn_t cppi_interrupt(int, void *);
#endif /* end of ifndef _CPPI_DMA_H_ */