summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2010-07-09 18:09:26 -0700
committerVinson Lee <[email protected]>2010-07-09 18:09:26 -0700
commit308f52d57341bc864baf619ac0fbc2b33f5cc5a5 (patch)
tree7f7bfc918c8396b85040de3b7a01820ffbd42419
parent0c767b9ae6f56968cd35efcaa79c74375ca692d6 (diff)
r600: Fix include recursion.
r700_chip.h included r600_context.h, which included r700_chip.h. Remove the unnecessary r600_context.h inclusion and add missing headers.
-rw-r--r--src/mesa/drivers/dri/r600/r700_chip.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_chip.h b/src/mesa/drivers/dri/r600/r700_chip.h
index ae249e15fd4..0b6b72f8501 100644
--- a/src/mesa/drivers/dri/r600/r700_chip.h
+++ b/src/mesa/drivers/dri/r600/r700_chip.h
@@ -27,7 +27,9 @@
#ifndef _R700_CHIP_H_
#define _R700_CHIP_H_
-#include "r600_context.h"
+#include <GL/gl.h>
+
+#include "radeon_common_context.h"
#include "r600_reg.h"
#include "r600_reg_auto_r6xx.h"