projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mach64
/
mach64_ioctl.c
diff --git
a/src/mesa/drivers/dri/mach64/mach64_ioctl.c
b/src/mesa/drivers/dri/mach64/mach64_ioctl.c
index 0a2df32c076595d550f77ec58e09889375b7dbff..ef5c0625c3159683849e8e666c3a00fa5afcaf40 100644
(file)
--- a/
src/mesa/drivers/dri/mach64/mach64_ioctl.c
+++ b/
src/mesa/drivers/dri/mach64/mach64_ioctl.c
@@
-35,8
+35,8
@@
#include "mach64_ioctl.h"
#include "mach64_tex.h"
-#include "imports.h"
-#include "macros.h"
+#include "
main/
imports.h"
+#include "ma
in/ma
cros.h"
#include "swrast/swrast.h"