diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
| commit | bf805d3bf5bf191aa669b6155316a78917cf9b0e (patch) | |
| tree | d76223fb22381485f7ecc8f6c7d026dcd88d80f3 /src/mesa/drivers/dri/i915/intel_batchbuffer.c | |
| parent | 9e06cf00cfb24528653913fc90eded4d370c1149 (diff) | |
| parent | 72c888869f4e5074e57c349ec356798959be791e (diff) | |
Merge branch 'master' into i915-superioctl
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 0422029353..74c75a3769 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 |