summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_inlines.h
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/mesa/state_tracker/st_inlines.h
parentf8d824e09a54871df899f368ebaadc9a4e5b62ff (diff)
parent976afaf98f4b1ce32003dd014cbb3c09063bcb68 (diff)
Merge branch 'gallium-embedded'
Diffstat (limited to 'src/mesa/state_tracker/st_inlines.h')
-rw-r--r--src/mesa/state_tracker/st_inlines.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_inlines.h b/src/mesa/state_tracker/st_inlines.h
index dccc46f12d7..e105870bc75 100644
--- a/src/mesa/state_tracker/st_inlines.h
+++ b/src/mesa/state_tracker/st_inlines.h
@@ -36,7 +36,7 @@
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
#include "pipe/p_defines.h"
-#include "pipe/p_inlines.h"
+#include "util/u_inlines.h"
#include "pipe/p_state.h"
#include "st_context.h"