git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
sdhci-of-hlwd.c
diff --git
a/drivers/mmc/host/sdhci-of-hlwd.c
b/drivers/mmc/host/sdhci-of-hlwd.c
index
9b0d794
..
3619adc
100644
(file)
--- a/
drivers/mmc/host/sdhci-of-hlwd.c
+++ b/
drivers/mmc/host/sdhci-of-hlwd.c
@@
-87,13
+87,10
@@
static struct platform_driver sdhci_hlwd_driver = {
.name = "sdhci-hlwd",
.owner = THIS_MODULE,
.of_match_table = sdhci_hlwd_of_match,
.name = "sdhci-hlwd",
.owner = THIS_MODULE,
.of_match_table = sdhci_hlwd_of_match,
+ .pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_hlwd_probe,
.remove = __devexit_p(sdhci_hlwd_remove),
},
.probe = sdhci_hlwd_probe,
.remove = __devexit_p(sdhci_hlwd_remove),
-#ifdef CONFIG_PM
- .suspend = sdhci_pltfm_suspend,
- .resume = sdhci_pltfm_resume,
-#endif
};
static int __init sdhci_hlwd_init(void)
};
static int __init sdhci_hlwd_init(void)