projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nfsd-4.7' of git://linux-nfs.org/~bfields/linux
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_prime.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_prime.c
b/drivers/gpu/drm/nouveau/nouveau_prime.c
index dd32ad6db53d2525bfbdde846a87f8b369269cc8..a0a9704cfe2b25cdc1b87b56227b05635131d077 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_prime.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_prime.c
@@
-25,7
+25,7
@@
#include <drm/drmP.h>
#include <linux/dma-buf.h>
-#include "nouveau_dr
m
.h"
+#include "nouveau_dr
v
.h"
#include "nouveau_gem.h"
struct sg_table *nouveau_gem_prime_get_sg_table(struct drm_gem_object *obj)