OSDN Git Service

Merge branch 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon/linux-at91...
authorDave Airlie <airlied@redhat.com>
Wed, 19 Aug 2015 23:40:06 +0000 (09:40 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 19 Aug 2015 23:40:06 +0000 (09:40 +1000)
single atmel hlcdc fix.

* 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon/linux-at91:
  drm/atmel-hlcdc: Compile suspend/resume for PM_SLEEP only

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

index 6fad1f9..ef6182b 100644 (file)
@@ -559,7 +559,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);