Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: i.MX31: framebuffer driver i.MX31: Image Processing Unit DMA and IRQ drivers dmaengine: add async_tx_clear_ack() macro dmaengine: dma_issue_pending_all == nop when CONFIG_DMA_ENGINE=n dmaengine: kill some dubious WARN_ONCEs fsldma: print correct IRQ on mpc83xx fsldma: check for NO_IRQ in fsl_dma_chan_remove() dmatest: Use custom map/unmap for destination buffer fsldma: use a valid 'device' for dma_pool_create dmaengine: fix dependency chaining
Showing
- arch/arm/plat-mxc/include/mach/ipu.h 181 additions, 0 deletionsarch/arm/plat-mxc/include/mach/ipu.h
- arch/arm/plat-mxc/include/mach/irqs.h 9 additions, 1 deletionarch/arm/plat-mxc/include/mach/irqs.h
- arch/arm/plat-mxc/include/mach/mx3fb.h 38 additions, 0 deletionsarch/arm/plat-mxc/include/mach/mx3fb.h
- drivers/dma/Kconfig 19 additions, 0 deletionsdrivers/dma/Kconfig
- drivers/dma/Makefile 1 addition, 0 deletionsdrivers/dma/Makefile
- drivers/dma/dmaengine.c 2 additions, 6 deletionsdrivers/dma/dmaengine.c
- drivers/dma/dmatest.c 31 additions, 4 deletionsdrivers/dma/dmatest.c
- drivers/dma/fsldma.c 5 additions, 3 deletionsdrivers/dma/fsldma.c
- drivers/dma/ipu/Makefile 1 addition, 0 deletionsdrivers/dma/ipu/Makefile
- drivers/dma/ipu/ipu_idmac.c 1740 additions, 0 deletionsdrivers/dma/ipu/ipu_idmac.c
- drivers/dma/ipu/ipu_intern.h 176 additions, 0 deletionsdrivers/dma/ipu/ipu_intern.h
- drivers/dma/ipu/ipu_irq.c 413 additions, 0 deletionsdrivers/dma/ipu/ipu_irq.c
- drivers/video/Kconfig 12 additions, 0 deletionsdrivers/video/Kconfig
- drivers/video/Makefile 1 addition, 0 deletionsdrivers/video/Makefile
- drivers/video/mx3fb.c 1555 additions, 0 deletionsdrivers/video/mx3fb.c
- include/linux/dmaengine.h 10 additions, 1 deletioninclude/linux/dmaengine.h
Loading
Please register or sign in to comment