projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
745325f
)
MLK-22302-3: dmaengine: mxs-dma: fix build warning with CONFIG_PM_SLEEP=n
author
Robin Gong
<yibin.gong@nxp.com>
Tue, 23 Jul 2019 15:43:41 +0000
(23:43 +0800)
committer
Robin Gong
<yibin.gong@nxp.com>
Tue, 23 Jul 2019 16:50:48 +0000
(
00:50
+0800)
Fix build waring with CONFIG_PM_SLEEP=n.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Andy Duan <fugang.duan@nxp.com>
(cherry picked from commit
3d4bb7eb025b18c8699e80a1a76226887120b198
)
drivers/dma/mxs-dma.c
patch
|
blob
|
history
diff --git
a/drivers/dma/mxs-dma.c
b/drivers/dma/mxs-dma.c
index
cd8357b
..
1635f81
100644
(file)
--- a/
drivers/dma/mxs-dma.c
+++ b/
drivers/dma/mxs-dma.c
@@
-947,6
+947,7
@@
static int mxs_dma_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PM_SLEEP
static int mxs_dma_pm_suspend(struct device *dev)
{
int ret;
@@
-967,6
+968,7
@@
static int mxs_dma_pm_resume(struct device *dev)
return 0;
}
+#endif
int mxs_dma_runtime_suspend(struct device *dev)
{