diff options
| author | Linaro CI <ci_notify@linaro.org> | 2017-09-24 20:35:18 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2017-09-24 20:35:18 +0000 |
| commit | c03adb6848aa7e80ad0c0e46b9f6d96ba0a91822 (patch) | |
| tree | 05de08cd2d77fc5697e9e6fc1fae5ef23a1d0a85 /include/linux/mmc/dw_mmc.h | |
| parent | 6ce85a78b6151e8ab2eac57e1447d90d3efb551d (diff) | |
| parent | 357fdc8959dc79696d9c43c2a3f7a93e3a503d87 (diff) | |
Merge remote-tracking branch 'sumit-lts/lts-4.4.y-hikey' into linux-4.4.y4.4.89-rc1-hikey-20170924
Diffstat (limited to 'include/linux/mmc/dw_mmc.h')
| -rw-r--r-- | include/linux/mmc/dw_mmc.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 7776afb0ffa5..b4295be358ec 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -14,9 +14,10 @@ #ifndef LINUX_MMC_DW_MMC_H #define LINUX_MMC_DW_MMC_H -#include <linux/scatterlist.h> -#include <linux/mmc/core.h> #include <linux/dmaengine.h> +#include <linux/mmc/core.h> +#include <linux/reset.h> +#include <linux/scatterlist.h> #define MAX_MCI_SLOTS 2 @@ -276,6 +277,7 @@ struct dw_mci_board { /* delay in mS before detecting cards after interrupt */ u32 detect_delay_ms; + struct reset_control *rstc; struct dw_mci_dma_ops *dma_ops; struct dma_pdata *data; }; |