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-pxav3.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-pxav3.c')
| -rw-r--r-- | drivers/mmc/host/sdhci-pxav3.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index cff4ad3e7a59..15673a7ee6a5 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -264,13 +264,10 @@ static struct platform_driver sdhci_pxav3_driver = { .driver = { .name = "sdhci-pxav3", .owner = THIS_MODULE, + .pm = SDHCI_PLTFM_PMOPS, }, .probe = sdhci_pxav3_probe, .remove = __devexit_p(sdhci_pxav3_remove), -#ifdef CONFIG_PM - .suspend = sdhci_pltfm_suspend, - .resume = sdhci_pltfm_resume, -#endif }; static int __init sdhci_pxav3_init(void) { |