diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 12:09:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 12:09:30 -0700 |
| commit | 6b2a4f7a5b777ea8fcf3bb38a0a33e68a920a9dc (patch) | |
| tree | fcf7d9bddc31974ad046aecd51cc856c68e14cdd /include/linux/mfd | |
| parent | eefbab599531240adaffa1d23900afbc8b0342bd (diff) | |
| parent | 022b483596fabb5d1320aa4b76f43a754063f37e (diff) | |
| download | kernel_samsung_smdk4412-6b2a4f7a5b777ea8fcf3bb38a0a33e68a920a9dc.zip kernel_samsung_smdk4412-6b2a4f7a5b777ea8fcf3bb38a0a33e68a920a9dc.tar.gz kernel_samsung_smdk4412-6b2a4f7a5b777ea8fcf3bb38a0a33e68a920a9dc.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (26 commits)
mmc: SDHI should depend on SUPERH || ARCH_SHMOBILE
mmc: tmio_mmc: Move some defines into a shared header
mmc: tmio: support aggressive clock gating
mmc: tmio: fix power-mode interpretation
mmc: tmio: remove work-around for unmasked SDIO interrupts
sh: fix SDHI IO address-range
ARM: mach-shmobile: fix SDHI IO address-range
mmc: tmio: only access registers above 0xff, if available
mfd: remove now redundant sh_mobile_sdhi.h header
sh: convert boards to use linux/mmc/sh_mobile_sdhi.h
ARM: mach-shmobile: convert boards to use linux/mmc/sh_mobile_sdhi.h
mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver
sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD
mmc: tmio: split core functionality, DMA and MFD glue
mmc: tmio: use PIO for short transfers
mmc: tmio-mmc: Improve DMA stability on sh-mobile
mmc: fix mmc_app_send_scr() for dma transfer
mmc: sdhci-esdhc: enable esdhc on imx53
mmc: sdhci-esdhc: use writel/readl as general APIs
mmc: sdhci: add the abort CMDTYPE bits definition
...
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/sh_mobile_sdhi.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/mfd/sh_mobile_sdhi.h b/include/linux/mfd/sh_mobile_sdhi.h deleted file mode 100644 index c981b95..0000000 --- a/include/linux/mfd/sh_mobile_sdhi.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __SH_MOBILE_SDHI_H__ -#define __SH_MOBILE_SDHI_H__ - -#include <linux/types.h> - -struct sh_mobile_sdhi_info { - int dma_slave_tx; - int dma_slave_rx; - unsigned long tmio_flags; - unsigned long tmio_caps; - u32 tmio_ocr_mask; /* available MMC voltages */ - void (*set_pwr)(struct platform_device *pdev, int state); - int (*get_cd)(struct platform_device *pdev); -}; - -#endif /* __SH_MOBILE_SDHI_H__ */ |