diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:00:25 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:00:25 -0800 |
commit | 3f6f1cd6ffb473f426858692e8e1cb82aea137eb (patch) | |
tree | d3f3f931d3ed57041dc0feafb8fdbf9843fcb5fc /drivers/mmc/host/sdhci.h | |
parent | 1443f8a0b95c07cee9df4420a30eea24123af3f3 (diff) | |
parent | b57870e28d27561ea5bad538c22b7d10f531b35c (diff) |
Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards
From Haojian Zhuang:
* 'armsoc/board' of git://github.com/hzhuang1/linux:
ARM: mmp: select pinctrl driver
+ Linux 3.7-rc6
Diffstat (limited to 'drivers/mmc/host/sdhci.h')
-rw-r--r-- | drivers/mmc/host/sdhci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 97653ea8942b..71a4a7ed46c5 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -278,6 +278,7 @@ struct sdhci_ops { void (*hw_reset)(struct sdhci_host *host); void (*platform_suspend)(struct sdhci_host *host); void (*platform_resume)(struct sdhci_host *host); + void (*platform_init)(struct sdhci_host *host); }; #ifdef CONFIG_MMC_SDHCI_IO_ACCESSORS |