diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-08-20 02:40:06 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-08-20 02:40:06 +0300 |
| commit | 82bd279d0b2ed538cd932978ffd7ec33587313f2 (patch) | |
| tree | 87e8a6c2bc7b9d8c7aae6bcf60c8f5d45a062eed | |
| parent | 1b647a166f07dcf08709c8606470f4b17a4aa11d (diff) | |
| parent | dbb3df2d58754e4df58620e60370d166c2cb6744 (diff) | |
| download | linux-82bd279d0b2ed538cd932978ffd7ec33587313f2.tar.xz | |
Merge branch 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon/linux-at91 into drm-fixes
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
| -rw-r--r-- | drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 |
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 6fad1f9648f3..ef6182bc8e5e 100644 --- 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(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); |