diff options
author | José Fonseca <[email protected]> | 2010-02-03 18:54:13 +0000 |
---|---|---|
committer | José Fonseca <[email protected]> | 2010-02-03 18:54:13 +0000 |
commit | 45dac0d82a5a69166e86dce77c2550f7512c541e (patch) | |
tree | 41a10f422174ef9543db2396057f052c056eb396 /src/gallium/auxiliary/tgsi/tgsi_text.c | |
parent | f8d824e09a54871df899f368ebaadc9a4e5b62ff (diff) | |
parent | 976afaf98f4b1ce32003dd014cbb3c09063bcb68 (diff) |
Merge branch 'gallium-embedded'
Diffstat (limited to 'src/gallium/auxiliary/tgsi/tgsi_text.c')
-rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_text.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c index 96be353e264..f918151daaa 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_text.c +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c @@ -29,7 +29,7 @@ #include "util/u_memory.h" #include "util/u_prim.h" #include "pipe/p_defines.h" -#include "pipe/p_inlines.h" +#include "util/u_inlines.h" #include "tgsi_text.h" #include "tgsi_build.h" #include "tgsi_info.h" |