diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2015-01-20 10:44:08 +0100 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-01-20 10:44:08 +0100 |
commit | 9cd0ef2b104836e7bb344a343654d91ae9e55cb0 (patch) | |
tree | ba8a320d681584a4d58c0eecbc9e0d3999c2a83c /include/linux/mmc | |
parent | 87a507459f49862772127acf051609b37363dd16 (diff) | |
parent | de122cb1745313f331dc7c7923b484343d455e64 (diff) | |
download | linux-9cd0ef2b104836e7bb344a343654d91ae9e55cb0.tar.gz linux-9cd0ef2b104836e7bb344a343654d91ae9e55cb0.tar.bz2 linux-9cd0ef2b104836e7bb344a343654d91ae9e55cb0.zip |
Merge branch 'tmio' into next
Diffstat (limited to 'include/linux/mmc')
-rw-r--r-- | include/linux/mmc/sh_mobile_sdhi.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h index 68927ae50845..da77e5e2041d 100644 --- a/include/linux/mmc/sh_mobile_sdhi.h +++ b/include/linux/mmc/sh_mobile_sdhi.h @@ -3,20 +3,10 @@ #include <linux/types.h> -struct platform_device; - #define SH_MOBILE_SDHI_IRQ_CARD_DETECT "card_detect" #define SH_MOBILE_SDHI_IRQ_SDCARD "sdcard" #define SH_MOBILE_SDHI_IRQ_SDIO "sdio" -/** - * struct sh_mobile_sdhi_ops - SDHI driver callbacks - * @cd_wakeup: trigger a card-detection run - */ -struct sh_mobile_sdhi_ops { - void (*cd_wakeup)(const struct platform_device *pdev); -}; - struct sh_mobile_sdhi_info { int dma_slave_tx; int dma_slave_rx; @@ -25,11 +15,6 @@ struct sh_mobile_sdhi_info { unsigned long tmio_caps2; u32 tmio_ocr_mask; /* available MMC voltages */ unsigned int cd_gpio; - - /* callbacks for board specific setup code */ - int (*init)(struct platform_device *pdev, - const struct sh_mobile_sdhi_ops *ops); - void (*cleanup)(struct platform_device *pdev); }; #endif /* LINUX_MMC_SH_MOBILE_SDHI_H */ |