linux-sg2042/include/linux/amba
Linus Torvalds 57f2685c16 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (53 commits)
  ARM: mach-shmobile: specify CHCLR registers on SH7372
  dma: shdma: fix runtime PM: clear channel buffers on reset
  dma/imx-sdma: save irq flags when use spin_lock in sdma_tx_submit
  dmaengine/ste_dma40: clear LNK on channel startup
  dmaengine: intel_mid_dma: remove legacy pm interface
  ASoC: mxs: correct 'direction' of device_prep_dma_cyclic
  dmaengine: intel_mid_dma: error path fix
  dmaengine: intel_mid_dma: locking and freeing fixes
  mtd: gpmi-nand: move to dma_transfer_direction
  mtd: fix compile error for gpmi-nand
  mmc: mxs-mmc: fix the dma_transfer_direction migration
  dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
  dma: mxs-dma: Don't use CLKGATE bits in CTRL0 to disable DMA channels
  dma: mxs-dma: make mxs_dma_prep_slave_sg() multi user safe
  dma: mxs-dma: Always leave mxs_dma_init() with the clock disabled.
  dma: mxs-dma: fix a typo in comment
  DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove
  video i.MX IPU: Fix display connections
  i.MX IPU DMA: Fix wrong burstsize settings
  dmaengine/ste_dma40: allow fixed physical channel
  ...

Fix up conflicts in drivers/dma/{Kconfig,mxs-dma.c,pl330.c}

The conflicts looked pretty trivial, but I'll ask people to verify them.
2012-01-17 18:40:24 -08:00
..
bus.h ARM: amba: Move definition of struct amba_id to mod_devicetable.h 2011-11-22 10:58:30 +00:00
clcd.h Fix common misspellings 2011-03-31 11:26:23 -03:00
kmi.h [ARM] Move AMBA include files to include/linux/amba/ 2006-01-07 13:52:45 +00:00
mmci.h mmc: mmci: add capabilities2 for MMC_CAP2 2012-01-11 23:58:41 -05:00
pl08x.h dmaengine: move drivers to dma_transfer_direction 2011-10-27 20:53:43 +05:30
pl022.h spi/pl022: add support for pm_runtime autosuspend 2011-12-01 17:16:08 +01:00
pl061.h gpio: pl061: convert to use 0 for no irq 2012-01-04 10:10:19 -06:00
pl093.h ARM: PL093: Header file for PL093 SSMC PrimeCell 2009-07-30 23:22:54 +01:00
pl330.h DMA: PL330: Infer transfer direction from transfer request instead of platform data 2011-12-23 10:07:03 +09:00
serial.h amba pl011: workaround for uart registers lockup 2011-06-16 12:01:57 -07:00