kernel-fxtec-pro1x/include/linux/mmc
Linus Torvalds c511dc1fb6 Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine update from Vinod Koul:
 "This time we have a new dmaengine driver from the tegra folks.  Also
  we have Guennadi's cleanup of sh drivers which incudes a library for
  sh drivers.  And the usual odd fixes in bunch of drivers and some nice
  cleanup of dw_dmac from Andy."

Fix up conflicts in drivers/mmc/host/sh_mmcif.c

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
  dmaengine: Cleanup logging messages
  mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
  dma: sh: provide a migration path for slave drivers to stop using .private
  dma: sh: use an integer slave ID to improve API compatibility
  dmaengine: shdma: prepare to stop using struct dma_chan::private
  sh: remove unused DMA device pointer from SIU platform data
  ASoC: siu: don't use DMA device for channel filtering
  dmaengine: shdma: (cosmetic) simplify a static function
  dmaengine: at_hdmac: add a few const qualifiers
  dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
  dw_dmac: mark dwc_dump_lli inline
  dma: mxs-dma: Export missing symbols from mxs-dma.c
  dma: shdma: convert to the shdma base library
  ASoC: fsi: prepare for conversion to the shdma base library
  usb: renesas_usbhs: prepare for conversion to the shdma base library
  ASoC: siu: prepare for conversion to the shdma base library
  serial: sh-sci: prepare for conversion to the shdma base library
  mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
  mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
  dma: shdma: prepare for conversion to the shdma base library
  ...
2012-07-24 17:12:54 -07:00
..
boot.h mmc: Standardize header file inclusion checks. 2011-07-20 17:20:48 -04:00
card.h mmc: sdhci: only set 200mA support for 1.8v if 200mA is available 2012-07-21 00:02:23 -04:00
core.h MMC highlights for 3.4: 2012-03-28 20:59:45 -07:00
dw_mmc.h mmc: dw_mmc: make multiple instances of dw_mci_card_workqueue 2012-05-09 10:14:10 -04:00
host.h mmc: sd: Fix sd current limit setting 2012-07-22 15:25:52 -04:00
ioctl.h headers: include linux/types.h where appropriate 2012-03-23 16:58:31 -07:00
Kbuild mmc: core: Add mmc CMD+ACMD passthrough ioctl 2011-05-24 21:02:54 -04:00
mmc.h mmc: core: fix the decision of HS200/DDR card-type 2012-05-09 10:03:21 -04:00
mxs-mmc.h mmc: mxs-mmc: move header from mach into linux folder 2012-05-13 08:05:38 +08:00
pm.h mmc: Standardize header file inclusion checks. 2011-07-20 17:20:48 -04:00
sd.h mmc: Standardize header file inclusion checks. 2011-07-20 17:20:48 -04:00
sdhci-pci-data.h mmc: sdhci-pci: add platform data 2012-01-11 23:58:47 -05:00
sdhci-spear.h Viresh has moved 2012-06-20 14:39:36 -07:00
sdhci.h mmc: sdhci: Introduce new flag SDHCI_USING_RETUNING_TIMER 2012-07-22 15:25:49 -04:00
sdio.h mmc: sdio: fix setting card data bus width as 4-bit 2012-06-06 09:22:53 -04:00
sdio_func.h mmc: Standardize header file inclusion checks. 2011-07-20 17:20:48 -04:00
sdio_ids.h mmc: Standardize header file inclusion checks. 2011-07-20 17:20:48 -04:00
sh_mmcif.h Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma 2012-07-24 17:12:54 -07:00
sh_mobile_sdhi.h mmc: sh_mobile_sdhi: support caps2 flags 2012-07-21 00:02:19 -04:00
slot-gpio.h mmc: core: add WP pin handler to slot functions 2012-07-21 00:02:18 -04:00
tmio.h mmc: sdhi: Add write16_hook 2011-07-20 17:20:57 -04:00