git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
arm
/
hdlcd_crtc.c
diff --git
a/drivers/gpu/drm/arm/hdlcd_crtc.c
b/drivers/gpu/drm/arm/hdlcd_crtc.c
index 16e1e20cf04cf45ba5921715511d1babc9173c4a..72b22b805412b2cb19d8d90e85904be737ecf335 100644
(file)
--- a/
drivers/gpu/drm/arm/hdlcd_crtc.c
+++ b/
drivers/gpu/drm/arm/hdlcd_crtc.c
@@
-315,6
+315,7
@@
static struct drm_plane *hdlcd_plane_init(struct drm_device *drm)
ret = drm_universal_plane_init(drm, plane, 0xff, &hdlcd_plane_funcs,
formats, ARRAY_SIZE(formats),
+ NULL,
DRM_PLANE_TYPE_PRIMARY, NULL);
if (ret) {
return ERR_PTR(ret);