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 tag 'pm+acpi-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
sdhci-acpi.c
diff --git
a/drivers/mmc/host/sdhci-acpi.c
b/drivers/mmc/host/sdhci-acpi.c
index
daba49a
..
c01eac7
100644
(file)
--- a/
drivers/mmc/host/sdhci-acpi.c
+++ b/
drivers/mmc/host/sdhci-acpi.c
@@
-430,7
+430,7
@@
static int sdhci_acpi_resume(struct device *dev)
#endif
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int sdhci_acpi_runtime_suspend(struct device *dev)
{