projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-for-davem-2016-06-29-v2' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
dispnv04
/
disp.c
diff --git
a/drivers/gpu/drm/nouveau/dispnv04/disp.c
b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index
b4a6bc4
..
aea81a5
100644
(file)
--- a/
drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/
drivers/gpu/drm/nouveau/dispnv04/disp.c
@@
-25,7
+25,7
@@
#include <drm/drmP.h>
#include <drm/drm_crtc_helper.h>
-#include "nouveau_dr
m
.h"
+#include "nouveau_dr
v
.h"
#include "nouveau_reg.h"
#include "hw.h"
#include "nouveau_encoder.h"