projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_ioc32.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
index
aa3a067
..
08214bc
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_ioc32.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_ioc32.c
@@
-35,7
+35,7
@@
#include <drm/drmP.h>
-#include "nouveau_
drv
.h"
+#include "nouveau_
ioctl
.h"
/**
* Called whenever a 32-bit process running under a 64-bit kernel