summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv20/nv20_state.c
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2010-02-03 18:54:13 +0000
committerJosé Fonseca <[email protected]>2010-02-03 18:54:13 +0000
commit45dac0d82a5a69166e86dce77c2550f7512c541e (patch)
tree41a10f422174ef9543db2396057f052c056eb396 /src/gallium/drivers/nv20/nv20_state.c
parentf8d824e09a54871df899f368ebaadc9a4e5b62ff (diff)
parent976afaf98f4b1ce32003dd014cbb3c09063bcb68 (diff)
Merge branch 'gallium-embedded'
Diffstat (limited to 'src/gallium/drivers/nv20/nv20_state.c')
-rw-r--r--src/gallium/drivers/nv20/nv20_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv20/nv20_state.c b/src/gallium/drivers/nv20/nv20_state.c
index 83335c790a0..923dc61cfb2 100644
--- a/src/gallium/drivers/nv20/nv20_state.c
+++ b/src/gallium/drivers/nv20/nv20_state.c
@@ -2,7 +2,7 @@
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
#include "pipe/p_shader_tokens.h"
-#include "pipe/p_inlines.h"
+#include "util/u_inlines.h"
#include "tgsi/tgsi_parse.h"