OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
[uclinux-h8/linux.git]
/
drivers
/
gpu
/
drm
/
atmel-hlcdc
/
atmel_hlcdc_dc.c
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);