Merge branch 'master' into i915-superioctl

2007-10-12 11:02:46 +10:00
parent 9e06cf00cf 72c888869f
commit bf805d3bf5
61 changed files with 1562 additions and 419 deletions
--- 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