projects
/
firefly-linux-kernel-4.4.55.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-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
spi
/
spi-pxa2xx.c
diff --git
a/drivers/spi/spi-pxa2xx.c
b/drivers/spi/spi-pxa2xx.c
index 2a41b2d6fa160dd7cc9836b7b5da4a0331fb242c..05c623cfb078d6503bd6d501cc1e821f07784d9e 100644
(file)
--- a/
drivers/spi/spi-pxa2xx.c
+++ b/
drivers/spi/spi-pxa2xx.c
@@
-1531,7
+1531,7
@@
static int pxa2xx_spi_resume(struct device *dev)
}
#endif
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int pxa2xx_spi_runtime_suspend(struct device *dev)
{
struct driver_data *drv_data = dev_get_drvdata(dev);