Patch "drm/atmel-hlcdc: Compile suspend/resume for PM_SLEEP only" has been added to the 4.1-stable tree

Patch "drm/atmel-hlcdc: Compile suspend/resume for PM_SLEEP only" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    drm/atmel-hlcdc: Compile suspend/resume for PM_SLEEP only

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-atmel-hlcdc-compile-suspend-resume-for-pm_sleep-only.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From dbb3df2d58754e4df58620e60370d166c2cb6744 Mon Sep 17 00:00:00 2001
From: Thierry Reding <treding@nvidia.com>
Date: Fri, 14 Aug 2015 13:58:20 +0200
Subject: drm/atmel-hlcdc: Compile suspend/resume for PM_SLEEP only

From: Thierry Reding <treding@nvidia.com>

commit dbb3df2d58754e4df58620e60370d166c2cb6744 upstream.

If PM is enabled but PM_SLEEP is disabled, the suspend/resume functions
are still unused and produce a compiler warning.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
@@ -559,7 +559,7 @@ static int atmel_hlcdc_dc_drm_remove(str
 	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);


Patches currently in stable-queue which might be from treding@nvidia.com are

queue-4.1/drm-atmel-hlcdc-compile-suspend-resume-for-pm_sleep-only.patch
queue-4.1/arm-v7-setup-function-should-invalidate-l1-cache.patch