diff options
Diffstat (limited to 'include/linux/mmc/host.h')
-rw-r--r-- | include/linux/mmc/host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 9f322706f7cb..0c8cbe5d1550 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h | |||
@@ -166,7 +166,6 @@ struct mmc_async_req { | |||
166 | * struct mmc_slot - MMC slot functions | 166 | * struct mmc_slot - MMC slot functions |
167 | * | 167 | * |
168 | * @cd_irq: MMC/SD-card slot hotplug detection IRQ or -EINVAL | 168 | * @cd_irq: MMC/SD-card slot hotplug detection IRQ or -EINVAL |
169 | * @lock: protect the @handler_priv pointer | ||
170 | * @handler_priv: MMC/SD-card slot context | 169 | * @handler_priv: MMC/SD-card slot context |
171 | * | 170 | * |
172 | * Some MMC/SD host controllers implement slot-functions like card and | 171 | * Some MMC/SD host controllers implement slot-functions like card and |
@@ -176,7 +175,6 @@ struct mmc_async_req { | |||
176 | */ | 175 | */ |
177 | struct mmc_slot { | 176 | struct mmc_slot { |
178 | int cd_irq; | 177 | int cd_irq; |
179 | struct mutex lock; | ||
180 | void *handler_priv; | 178 | void *handler_priv; |
181 | }; | 179 | }; |
182 | 180 | ||
@@ -197,6 +195,7 @@ struct mmc_context_info { | |||
197 | }; | 195 | }; |
198 | 196 | ||
199 | struct regulator; | 197 | struct regulator; |
198 | struct mmc_pwrseq; | ||
200 | 199 | ||
201 | struct mmc_supply { | 200 | struct mmc_supply { |
202 | struct regulator *vmmc; /* Card power supply */ | 201 | struct regulator *vmmc; /* Card power supply */ |
@@ -208,6 +207,7 @@ struct mmc_host { | |||
208 | struct device class_dev; | 207 | struct device class_dev; |
209 | int index; | 208 | int index; |
210 | const struct mmc_host_ops *ops; | 209 | const struct mmc_host_ops *ops; |
210 | struct mmc_pwrseq *pwrseq; | ||
211 | unsigned int f_min; | 211 | unsigned int f_min; |
212 | unsigned int f_max; | 212 | unsigned int f_max; |
213 | unsigned int f_init; | 213 | unsigned int f_init; |