diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-04-21 00:21:14 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-04-21 00:21:14 +0530 |
| commit | b53c7582805b10d6a32e88e22d16dc469e66a37a (patch) | |
| tree | 3775742e873f18d005fd8c2187411ead06c0049d /include/linux/mmc | |
| parent | 7d3beab16dd9eee86bb1a4dd05b51159fc7772f0 (diff) | |
| parent | 3cd44dcd35a6618df88c51561290dc02fb35b8e2 (diff) | |
| download | lwn-b53c7582805b10d6a32e88e22d16dc469e66a37a.tar.gz lwn-b53c7582805b10d6a32e88e22d16dc469e66a37a.zip | |
Merge branch 'topic/sh' into for-linus
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/sh_mobile_sdhi.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h index da77e5e2041d..95d6f0314a7d 100644 --- a/include/linux/mmc/sh_mobile_sdhi.h +++ b/include/linux/mmc/sh_mobile_sdhi.h @@ -7,14 +7,4 @@ #define SH_MOBILE_SDHI_IRQ_SDCARD "sdcard" #define SH_MOBILE_SDHI_IRQ_SDIO "sdio" -struct sh_mobile_sdhi_info { - int dma_slave_tx; - int dma_slave_rx; - unsigned long tmio_flags; - unsigned long tmio_caps; - unsigned long tmio_caps2; - u32 tmio_ocr_mask; /* available MMC voltages */ - unsigned int cd_gpio; -}; - #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */ |