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 branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nvc0_fence.c
diff --git
a/drivers/gpu/drm/nouveau/nvc0_fence.c
b/drivers/gpu/drm/nouveau/nvc0_fence.c
index becf19abda2d8a3f5d2a8cd6e565e6e17250640c..b79775788bbd7e57f151e64fb8aa2fcfe62b1f9d 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nvc0_fence.c
+++ b/
drivers/gpu/drm/nouveau/nvc0_fence.c
@@
-22,7
+22,7
@@
* Authors: Ben Skeggs
*/
-#include "nouveau_dr
m
.h"
+#include "nouveau_dr
v
.h"
#include "nouveau_dma.h"
#include "nouveau_fence.h"