diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-01-08 06:31:24 -0500 |
| commit | 636f0c70f2557e0819b50c74e31b4a027327015e (patch) | |
| tree | 3a259ef26659dac92782651440091b9f5ab1a7f7 /drivers/mmc/host/sdhci-pltfm.h | |
| parent | 675eef66e3edcab8065533edfefbcbbacb9a30d3 (diff) | |
| parent | 2e885057b7f75035f0b85e02f737891482815a81 (diff) | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Diffstat (limited to 'drivers/mmc/host/sdhci-pltfm.h')
| -rw-r--r-- | drivers/mmc/host/sdhci-pltfm.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-pltfm.h b/drivers/mmc/host/sdhci-pltfm.h index 3a9fc3f4084..37e0e184a0b 100644 --- a/drivers/mmc/host/sdhci-pltfm.h +++ b/drivers/mmc/host/sdhci-pltfm.h | |||
| @@ -99,8 +99,10 @@ extern int sdhci_pltfm_register(struct platform_device *pdev, | |||
| 99 | extern int sdhci_pltfm_unregister(struct platform_device *pdev); | 99 | extern int sdhci_pltfm_unregister(struct platform_device *pdev); |
| 100 | 100 | ||
| 101 | #ifdef CONFIG_PM | 101 | #ifdef CONFIG_PM |
| 102 | extern int sdhci_pltfm_suspend(struct platform_device *dev, pm_message_t state); | 102 | extern const struct dev_pm_ops sdhci_pltfm_pmops; |
| 103 | extern int sdhci_pltfm_resume(struct platform_device *dev); | 103 | #define SDHCI_PLTFM_PMOPS (&sdhci_pltfm_pmops) |
| 104 | #else | ||
| 105 | #define SDHCI_PLTFM_PMOPS NULL | ||
| 104 | #endif | 106 | #endif |
| 105 | 107 | ||
| 106 | #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */ | 108 | #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */ |