diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 12:20:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 12:20:15 -0700 |
| commit | 171c062188c6bc6ca5d28b2a9b9acc272ac1244e (patch) | |
| tree | 55cc32d79f952b2ee23479b38484230c5a656d1f /drivers/mmc/host/sdhci-msm.c | |
| parent | 682b7c1c8ea8885aa681ddf530d6cf2ad4f2dc15 (diff) | |
| parent | 5d01b7684b7ebade6d9ea9c94a31357aec731ecd (diff) | |
Merge tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc
Pull MMC fixes from Ulf Hansson:
"Here are some mmc fixes for 3.16.
- fix some various compiler warnings
- make atmel-mci compile again
- fix regression for sdhci-msm"
* tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc:
mmc: simplify SDHCI Kconfig dependencies
mmc: omap: don't select TPS65010
mmc: mvsdio: avoid compiler warning
mmc: atmel-mci: incude asm/cacheclush.h
mmc: sdhci-msm: Fix fallout from sdhci refactoring
mmc: usdhi6rol0: fix compiler warnings
Diffstat (limited to 'drivers/mmc/host/sdhci-msm.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index acb0e9eb55f1..40573a58486a 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -468,6 +468,10 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match); static struct sdhci_ops sdhci_msm_ops = { .platform_execute_tuning = sdhci_msm_execute_tuning, + .reset = sdhci_reset, + .set_clock = sdhci_set_clock, + .set_bus_width = sdhci_set_bus_width, + .set_uhs_signaling = sdhci_set_uhs_signaling, }; static int sdhci_msm_probe(struct platform_device *pdev) |