OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
1b647a1
)
Merge branch 'drm-atmel-hlcdc-fixes' of https://github.com/bbrezillon/linux-at91...
author
Dave Airlie
<airlied@redhat.com>
Wed, 19 Aug 2015 23:40:06 +0000
(09:40 +1000)
committer
Dave 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
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
index
6fad1f9
..
ef6182b
100644
(file)
--- 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);