diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-10-09 12:36:56 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-10-09 12:36:56 -0600 |
| commit | 9509afe97cd7d9f58c9b344242171952990abfc8 (patch) | |
| tree | 4a842e34ff97b362fc19297cfc7a569d1828e400 /src/mesa/drivers/dri/i915/intel_batchbuffer.c | |
| parent | 2dbd905ab0265b520efccce24ce9de66b6fc5fb0 (diff) | |
| parent | 4599683b480d295e407725e0fe99c357a0086092 (diff) | |
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/mesa/drivers/dri/i915/intel_batchbuffer.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_batchbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_batchbuffer.c b/src/mesa/drivers/dri/i915/intel_batchbuffer.c index 045ff0a5b0..639457d44a 100644 --- a/src/mesa/drivers/dri/i915/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.c @@ -28,7 +28,7 @@ #include "intel_batchbuffer.h" #include "intel_ioctl.h" #include "intel_decode.h" -#include "i915_debug.h" +#include "intel_reg.h" /* Relocations in kernel space: * - pass dma buffer seperately |