Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

[mesa.git] / src / mesa / pipe / nv50 / nv50_query.c

diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/mesa/pipe/nv50/nv50_query.c
index 69eb0e700b49ae26eac1e3c189a46f10de567500..d8c3491c2c5a5ce1ed80b2a4f047b6b4d1ada387 100644 (file)
--- a/src/mesa/pipe/nv50/nv50_query.c
+++ b/src/mesa/pipe/nv50/nv50_query.c
@@ -1,7 +1,6 @@
 #include "pipe/p_context.h"
 
 #include "nv50_context.h"
-#include "nv50_dma.h"
 
 static struct pipe_query *
 nv50_query_create(struct pipe_context *pipe, unsigned type)
@@ -30,7 +29,7 @@ nv50_query_end(struct pipe_context *pipe, struct pipe_query *q)
 
 static boolean
 nv50_query_result(struct pipe_context *pipe, struct pipe_query *q,
-                 boolean wait, uint64_t *result)
+                 boolean wait, uint64 *result)
 {
        NOUVEAU_ERR("unimplemented\n");
        *result = 0xdeadcafe;