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 'akpm' (second patch-bomb from Andrew)
[cascardo/linux.git]
/
drivers
/
dma
/
ste_dma40.c
diff --git
a/drivers/dma/ste_dma40.c
b/drivers/dma/ste_dma40.c
index
d2d0841
..
4d07106
100644
(file)
--- a/
drivers/dma/ste_dma40.c
+++ b/
drivers/dma/ste_dma40.c
@@
-3051,7
+3051,7
@@
static int dma40_runtime_resume(struct device *dev)
static const struct dev_pm_ops dma40_pm_ops = {
SET_LATE_SYSTEM_SLEEP_PM_OPS(dma40_suspend, dma40_resume)
- SET_
PM_
RUNTIME_PM_OPS(dma40_runtime_suspend,
+ SET_RUNTIME_PM_OPS(dma40_runtime_suspend,
dma40_runtime_resume,
NULL)
};