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 v5.3-rc1 into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
mxsfb
/
mxsfb_out.c
diff --git
a/drivers/gpu/drm/mxsfb/mxsfb_out.c
b/drivers/gpu/drm/mxsfb/mxsfb_out.c
index 91e76f9cead67155f3e104a0067258c0155df925..231d016c6f479b1f5ad014db043adb4a763a7570 100644
(file)
--- a/
drivers/gpu/drm/mxsfb/mxsfb_out.c
+++ b/
drivers/gpu/drm/mxsfb/mxsfb_out.c
@@
-15,7
+15,6
@@
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_simple_kms_helper.h>
-#include <drm/drmP.h>
#include "mxsfb_drv.h"