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
/
nouveau_usif.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_usif.c
b/drivers/gpu/drm/nouveau/nouveau_usif.c
index e9f52ef0be830442e1ea136a4580275d0cb5022c..675e9e077a95c6ec7a69a6891a7d6f16b8c6b139 100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_usif.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_usif.c
@@
-22,7
+22,7
@@
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
-#include "nouveau_dr
m
.h"
+#include "nouveau_dr
v
.h"
#include "nouveau_usif.h"
#include "nouveau_abi16.h"