xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v4.2-rc8' into drm-next

Browse Source 
Linux 4.2-rc8

Backmerge required for Intel so they can fix their -next tree up properly.
This commit is contained in:
Dave Airlie
2015-08-24 16:36:42 +10:00
parent e829d7ef9f c13dcf9f2d
commit 3732ce72b4
110 changed files with 688 additions and 1199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c
View File

@@ -773,7 +773,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);