projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/gallium-0.1' into gallium-0.2
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
ffb
/
ffb_lines.c
diff --git
a/src/mesa/drivers/dri/ffb/ffb_lines.c
b/src/mesa/drivers/dri/ffb/ffb_lines.c
index 829470146448ca46d9e2877902c6c43dc181df83..19dff50935464b67f8c6d793bf0471d02a8b66d0 100644
(file)
--- a/
src/mesa/drivers/dri/ffb/ffb_lines.c
+++ b/
src/mesa/drivers/dri/ffb/ffb_lines.c
@@
-25,8
+25,9
@@
* David S. Miller <davem@redhat.com>
*/
* David S. Miller <davem@redhat.com>
*/
-#include "mtypes.h"
-#include "mm.h"
+#include "main/mtypes.h"
+#include "main/mm.h"
+#include "main/extensions.h"
#include "ffb_dd.h"
#include "ffb_span.h"
#include "ffb_depth.h"
#include "ffb_dd.h"
#include "ffb_span.h"
#include "ffb_depth.h"
@@
-35,7
+36,6
@@
#include "ffb_lines.h"
#include "ffb_tris.h"
#include "ffb_lock.h"
#include "ffb_lines.h"
#include "ffb_tris.h"
#include "ffb_lock.h"
-#include "extensions.h"
#undef FFB_LINE_TRACE
#undef FFB_LINE_TRACE