summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/atmel-hlcdc
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2015-08-24 16:36:42 +1000
committerDave Airlie <airlied@redhat.com>2015-08-24 16:36:42 +1000
commit3732ce72b45a2a145803558758821bf198751276 (patch)
tree75047ed1f43cfd56231535c401924dbb27c4d0f0 /drivers/gpu/drm/atmel-hlcdc
parente829d7ef9f17d7b84d4c3d110ecd4b7b2bcba865 (diff)
parentc13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff)
Merge tag 'v4.2-rc8' into drm-next
Linux 4.2-rc8 Backmerge required for Intel so they can fix their -next tree up properly.
Diffstat (limited to 'drivers/gpu/drm/atmel-hlcdc')
-rw-r--r--drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index e058e0ad3c15..8bc62ec407f9 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -773,7 +773,7 @@ static int atmel_hlcdc_dc_drm_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int atmel_hlcdc_dc_drm_suspend(struct device *dev)
{
struct drm_device *drm_dev = dev_get_drvdata(dev);