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
/
omapdrm
/
omap_gem.c
diff --git
a/drivers/gpu/drm/omapdrm/omap_gem.c
b/drivers/gpu/drm/omapdrm/omap_gem.c
index 37378dbc50d0dcaf1962743a1e1746ab5e54a186..08f539efddfb1edb608a430c1ee84c949d01ebe2 100644
(file)
--- a/
drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/
drivers/gpu/drm/omapdrm/omap_gem.c
@@
-4,11
+4,13
@@
* Author: Rob Clark <rob.clark@linaro.org>
*/
* Author: Rob Clark <rob.clark@linaro.org>
*/
+#include <linux/dma-mapping.h>
#include <linux/seq_file.h>
#include <linux/shmem_fs.h>
#include <linux/spinlock.h>
#include <linux/pfn_t.h>
#include <linux/seq_file.h>
#include <linux/shmem_fs.h>
#include <linux/spinlock.h>
#include <linux/pfn_t.h>
+#include <drm/drm_prime.h>
#include <drm/drm_vma_manager.h>
#include "omap_drv.h"
#include <drm/drm_vma_manager.h>
#include "omap_drv.h"