diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-03 18:54:13 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-03 18:54:13 +0000 |
| commit | 45dac0d82a5a69166e86dce77c2550f7512c541e (patch) | |
| tree | 41a10f422174ef9543db2396057f052c056eb396 /src/gallium/drivers/i915/i915_context.c | |
| parent | f8d824e09a54871df899f368ebaadc9a4e5b62ff (diff) | |
| parent | 976afaf98f4b1ce32003dd014cbb3c09063bcb68 (diff) | |
Merge branch 'gallium-embedded'
Diffstat (limited to 'src/gallium/drivers/i915/i915_context.c')
| -rw-r--r-- | src/gallium/drivers/i915/i915_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/i915/i915_context.c b/src/gallium/drivers/i915/i915_context.c index a0c80d0228..f8219c9f29 100644 --- a/src/gallium/drivers/i915/i915_context.c +++ b/src/gallium/drivers/i915/i915_context.c @@ -32,7 +32,7 @@ #include "draw/draw_context.h" #include "pipe/p_defines.h" -#include "pipe/p_inlines.h" +#include "util/u_inlines.h" #include "util/u_memory.h" #include "pipe/p_screen.h" |