projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[cascardo/linux.git]
/
drivers
/
spi
/
spi-coldfire-qspi.c
diff --git
a/drivers/spi/spi-coldfire-qspi.c
b/drivers/spi/spi-coldfire-qspi.c
index
e2fa628
..
41b5dc4
100644
(file)
--- a/
drivers/spi/spi-coldfire-qspi.c
+++ b/
drivers/spi/spi-coldfire-qspi.c
@@
-491,7
+491,7
@@
static int mcfqspi_resume(struct device *dev)
}
#endif
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int mcfqspi_runtime_suspend(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);