diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-03 10:47:33 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-03 10:47:33 -0600 |
| commit | 63076d7f7f7f2650e5d0a4fa5dd2c412a255c237 (patch) | |
| tree | a489c1de793736fb0b379713245467f4358215fe /drivers/mmc/host/sdhci.c | |
| parent | 8645bee979600b0ba2ce7bfc847688abd1c2d477 (diff) | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
Merge commit 'v3.2-rc7' into rt-3.2-rc7-rt9
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 6d8eea323541..19ed580f2cab 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2327,7 +2327,7 @@ out: #ifdef CONFIG_PM -int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state) +int sdhci_suspend_host(struct sdhci_host *host) { int ret; |