diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/dw_mmc.h | 2 | ||||
| -rw-r--r-- | include/linux/mmc/sdhci.h | 3 | ||||
| -rw-r--r-- | include/linux/platform_data/mmc-omap.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index babaea93bca6..29ce014ab421 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h | |||
| @@ -213,6 +213,8 @@ struct dw_mci_dma_ops { | |||
| 213 | #define DW_MCI_QUIRK_HIGHSPEED BIT(2) | 213 | #define DW_MCI_QUIRK_HIGHSPEED BIT(2) |
| 214 | /* Unreliable card detection */ | 214 | /* Unreliable card detection */ |
| 215 | #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3) | 215 | #define DW_MCI_QUIRK_BROKEN_CARD_DETECTION BIT(3) |
| 216 | /* No write protect */ | ||
| 217 | #define DW_MCI_QUIRK_NO_WRITE_PROTECT BIT(4) | ||
| 216 | 218 | ||
| 217 | /* Slot level quirks */ | 219 | /* Slot level quirks */ |
| 218 | /* This slot has no write protect */ | 220 | /* This slot has no write protect */ |
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 08abe9941884..09ebe57d5ce9 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h | |||
| @@ -104,9 +104,6 @@ struct sdhci_host { | |||
| 104 | 104 | ||
| 105 | const struct sdhci_ops *ops; /* Low level hw interface */ | 105 | const struct sdhci_ops *ops; /* Low level hw interface */ |
| 106 | 106 | ||
| 107 | struct regulator *vmmc; /* Power regulator (vmmc) */ | ||
| 108 | struct regulator *vqmmc; /* Signaling regulator (vccq) */ | ||
| 109 | |||
| 110 | /* Internal data */ | 107 | /* Internal data */ |
| 111 | struct mmc_host *mmc; /* MMC structure */ | 108 | struct mmc_host *mmc; /* MMC structure */ |
| 112 | u64 dma_mask; /* custom DMA mask */ | 109 | u64 dma_mask; /* custom DMA mask */ |
diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h index 2bf1b30cb5dc..51e70cf25cbc 100644 --- a/include/linux/platform_data/mmc-omap.h +++ b/include/linux/platform_data/mmc-omap.h | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | */ | 28 | */ |
| 29 | #define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0) | 29 | #define OMAP_HSMMC_SUPPORTS_DUAL_VOLT BIT(0) |
| 30 | #define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1) | 30 | #define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ BIT(1) |
| 31 | #define OMAP_HSMMC_SWAKEUP_MISSING BIT(2) | ||
| 31 | 32 | ||
| 32 | struct mmc_card; | 33 | struct mmc_card; |
| 33 | 34 | ||
