diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 10:59:46 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 10:59:46 +0200 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /include/asm-arm/arch-imx/imx-dma.h | |
| parent | [PATCH] pata-qdi: fix le32 in data_xfer (diff) | |
| parent | ACPI: Allow setting SCI_EN bit in PM1_CONTROL register (diff) | |
| download | linux-701328a7b58d50d8640c21ba5fdf3170b1ddac16.tar.xz linux-701328a7b58d50d8640c21ba5fdf3170b1ddac16.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-arm/arch-imx/imx-dma.h')
| -rw-r--r-- | include/asm-arm/arch-imx/imx-dma.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/arch-imx/imx-dma.h b/include/asm-arm/arch-imx/imx-dma.h index 599f03e5a9ef..5b1066da4e1f 100644 --- a/include/asm-arm/arch-imx/imx-dma.h +++ b/include/asm-arm/arch-imx/imx-dma.h @@ -45,8 +45,8 @@ struct imx_dma_channel { const char *name; - void (*irq_handler) (int, void *, struct pt_regs *); - void (*err_handler) (int, void *, struct pt_regs *, int errcode); + void (*irq_handler) (int, void *); + void (*err_handler) (int, void *, int errcode); void *data; dmamode_t dma_mode; struct scatterlist *sg; @@ -77,8 +77,8 @@ imx_dma_setup_sg(imx_dmach_t dma_ch, int imx_dma_setup_handlers(imx_dmach_t dma_ch, - void (*irq_handler) (int, void *, struct pt_regs *), - void (*err_handler) (int, void *, struct pt_regs *, int), void *data); + void (*irq_handler) (int, void *), + void (*err_handler) (int, void *, int), void *data); void imx_dma_enable(imx_dmach_t dma_ch); |