diff options
author | 2012-01-09 16:16:29 +0000 | |
---|---|---|
committer | 2012-01-09 16:16:29 +0000 | |
commit | dcf7ec5ee62a78123057a1e286c88ca739717409 (patch) | |
tree | fa3f19434638a942ba66d236dde4d9aaadf8b370 /drivers/mmc/host/sdhci-cns3xxx.c | |
parent | Merge branch 'drivers/rtc-sa1100' into next/drivers (diff) | |
parent | Merge branch 'samsung/cleanup' into samsung/driver (diff) | |
download | linux-dev-dcf7ec5ee62a78123057a1e286c88ca739717409.tar.xz linux-dev-dcf7ec5ee62a78123057a1e286c88ca739717409.zip |
Merge branch 'samsung/driver' into next/drivers
Conflicts:
arch/arm/mach-mxs/include/mach/common.h
Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/mmc/host/sdhci-cns3xxx.c')
-rw-r--r-- | drivers/mmc/host/sdhci-cns3xxx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c index 87b6f079b6e0..b4257e700617 100644 --- a/drivers/mmc/host/sdhci-cns3xxx.c +++ b/drivers/mmc/host/sdhci-cns3xxx.c @@ -109,13 +109,10 @@ static struct platform_driver sdhci_cns3xxx_driver = { .driver = { .name = "sdhci-cns3xxx", .owner = THIS_MODULE, + .pm = SDHCI_PLTFM_PMOPS, }, .probe = sdhci_cns3xxx_probe, .remove = __devexit_p(sdhci_cns3xxx_remove), -#ifdef CONFIG_PM - .suspend = sdhci_pltfm_suspend, - .resume = sdhci_pltfm_resume, -#endif }; static int __init sdhci_cns3xxx_init(void) |