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 branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
exynos
/
exynos_drm_g2d.c
diff --git
a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 6ff8599f6cbf0beb09dc48a5a1b1c7b110a739bf..81a25083080845d626c6b50b2f46a9c4897e79f3 100644
(file)
--- a/
drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/
drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@
-1540,7
+1540,7
@@
static int g2d_resume(struct device *dev)
}
#endif
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int g2d_runtime_suspend(struct device *dev)
{
struct g2d_data *g2d = dev_get_drvdata(dev);