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 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
sdhci-dove.c
diff --git
a/drivers/mmc/host/sdhci-dove.c
b/drivers/mmc/host/sdhci-dove.c
index
f2d29dc
..
31acb70
100644
(file)
--- a/
drivers/mmc/host/sdhci-dove.c
+++ b/
drivers/mmc/host/sdhci-dove.c
@@
-20,6
+20,7
@@
*/
#include <linux/io.h>
*/
#include <linux/io.h>
+#include <linux/module.h>
#include <linux/mmc/host.h>
#include "sdhci-pltfm.h"
#include <linux/mmc/host.h>
#include "sdhci-pltfm.h"
@@
-82,13
+83,10
@@
static struct platform_driver sdhci_dove_driver = {
.driver = {
.name = "sdhci-dove",
.owner = THIS_MODULE,
.driver = {
.name = "sdhci-dove",
.owner = THIS_MODULE,
+ .pm = SDHCI_PLTFM_PMOPS,
},
.probe = sdhci_dove_probe,
.remove = __devexit_p(sdhci_dove_remove),
},
.probe = sdhci_dove_probe,
.remove = __devexit_p(sdhci_dove_remove),
-#ifdef CONFIG_PM
- .suspend = sdhci_pltfm_suspend,
- .resume = sdhci_pltfm_resume,
-#endif
};
static int __init sdhci_dove_init(void)
};
static int __init sdhci_dove_init(void)