diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-21 03:31:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-21 03:31:34 +0100 |
| commit | 11da3764a7b413c4e66138bd7bdb5bacd11617a6 (patch) | |
| tree | d93f68061a4c1e1a927e8c52d80f93396a076829 /drivers/mmc/host/sdhci-pltfm.h | |
| parent | SELinux: Fix RCU deref check warning in sel_netport_insert() (diff) | |
| parent | mmc: vub300: fix type of firmware_rom_wait_states module parameter (diff) | |
| download | linux-11da3764a7b413c4e66138bd7bdb5bacd11617a6.tar.xz linux-11da3764a7b413c4e66138bd7bdb5bacd11617a6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: vub300: fix type of firmware_rom_wait_states module parameter
Revert "mmc: enable runtime PM by default"
mmc: sdhci: remove "state" argument from sdhci_suspend_host
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 3a9fc3f40840..37e0e184a0bb 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, extern int sdhci_pltfm_unregister(struct platform_device *pdev); #ifdef CONFIG_PM -extern int sdhci_pltfm_suspend(struct platform_device *dev, pm_message_t state); -extern int sdhci_pltfm_resume(struct platform_device *dev); +extern const struct dev_pm_ops sdhci_pltfm_pmops; +#define SDHCI_PLTFM_PMOPS (&sdhci_pltfm_pmops) +#else +#define SDHCI_PLTFM_PMOPS NULL #endif #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */ |