mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2026-01-11 18:25:33 +00:00
fba9569924
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
dmaengine/ep93xx_dma: add module.h include
pch_dma: Reduce wasting memory
pch_dma: Fix suspend issue
dma/timberdale: free_irq() on an error path
dma: shdma: transfer based runtime PM
dmaengine: shdma: protect against the IRQ handler
dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
serial: sh-sci: don't filter on DMA device, use only channel ID
ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
ASoC: Samsung: Update DMA interface
spi/s3c64xx: Merge dma control code
spi/s3c64xx: Add support DMA engine API
ARM: SAMSUNG: Remove S3C-PL330-DMA driver
ARM: S5P64X0: Use generic DMA PL330 driver
ARM: S5PC100: Use generic DMA PL330 driver
ARM: S5PV210: Use generic DMA PL330 driver
...
Fix up fairly trivial conflicts in
- arch/arm/mach-exynos4/{Kconfig,clock.c}
- arch/arm/mach-s5p64x0/dma.c
|
||
|---|---|---|
| .. | ||
| arm_timer.h | ||
| cache-l2x0.h | ||
| cache-tauros2.h | ||
| clps7111.h | ||
| coresight.h | ||
| cs89712.h | ||
| debug-8250.S | ||
| debug-pl01x.S | ||
| dec21285.h | ||
| entry-macro-gic.S | ||
| entry-macro-iomd.S | ||
| ep7211.h | ||
| ep7212.h | ||
| gic.h | ||
| icst.h | ||
| ioc.h | ||
| iomd.h | ||
| iop3xx-adma.h | ||
| iop3xx-gpio.h | ||
| iop3xx.h | ||
| iop_adma.h | ||
| it8152.h | ||
| linkup-l1110.h | ||
| locomo.h | ||
| memc.h | ||
| pci_v3.h | ||
| pl080.h | ||
| pl330.h | ||
| sa1111.h | ||
| scoop.h | ||
| sp810.h | ||
| ssp.h | ||
| timer-sp.h | ||
| uengine.h | ||
| vic.h | ||