Skip to content

Commit

Permalink
Merge branch 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
airlied committed Aug 19, 2015
2 parents 1b647a1 + dbb3df2 commit 82bd279
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 82bd279

Please sign in to comment.