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 'drm-misc-next-2022-08-20-1' of git://anongit.freedesktop.org/drm/drm-misc...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
rockchip
/
rockchip_drm_drv.c
diff --git
a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index 13ed33e7445781a995e70eab7beb96574b287415..813f9f8c86982eee793b53041d477459d9d7ff9e 100644
(file)
--- a/
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@
-18,7
+18,7
@@
#include <drm/drm_aperture.h>
#include <drm/drm_drv.h>
#include <drm/drm_fb_helper.h>
-#include <drm/drm_gem_
c
ma_helper.h>
+#include <drm/drm_gem_
d
ma_helper.h>
#include <drm/drm_of.h>
#include <drm/drm_probe_helper.h>
#include <drm/drm_vblank.h>