projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-next
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nv50_display.c
diff --git
a/drivers/gpu/drm/nouveau/nv50_display.c
b/drivers/gpu/drm/nouveau/nv50_display.c
index
ec2e67e
..
3ffc2b0
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv50_display.c
+++ b/
drivers/gpu/drm/nouveau/nv50_display.c
@@
-39,7
+39,7
@@
#include <nvif/cl507d.h>
#include <nvif/cl507e.h>
-#include "nouveau_dr
m
.h"
+#include "nouveau_dr
v
.h"
#include "nouveau_dma.h"
#include "nouveau_gem.h"
#include "nouveau_connector.h"