diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-10-13 11:37:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-10-13 11:37:06 +0200 |
commit | 3c69ea44406bf27b6f2e9b2f11238c344fd8374d (patch) | |
tree | b459600bfffb55b6693b566f5dff859daa216dbe /drivers/gpu/drm/exynos/exynos_drm_rotator.c | |
parent | 53b3ffee788559fe26d32f21b223bf4bad959477 (diff) | |
parent | e8d65a8d985271a102f07c7456da5b86c19ffe16 (diff) | |
download | blackbird-op-linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.tar.gz blackbird-op-linux-3c69ea44406bf27b6f2e9b2f11238c344fd8374d.zip |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_rotator.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c index 425e70625388..2f5c118f4c8e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c @@ -786,6 +786,7 @@ static int rotator_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM static int rotator_clk_crtl(struct rot_context *rot, bool enable) { if (enable) { @@ -822,7 +823,6 @@ static int rotator_resume(struct device *dev) } #endif -#ifdef CONFIG_PM static int rotator_runtime_suspend(struct device *dev) { struct rot_context *rot = dev_get_drvdata(dev); |