From: Vinson Lee <vlee@vmware.com>
Date: Sat, 10 Jul 2010 01:09:26 +0000 (-0700)
Subject: r600: Fix include recursion.
X-Git-Tag: mesa-7.9-rc1~1969
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=308f52d57341bc864baf619ac0fbc2b33f5cc5a5;p=platform%2Fupstream%2Fmesa.git

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.
---

diff --git a/src/mesa/drivers/dri/r600/r700_chip.h b/src/mesa/drivers/dri/r600/r700_chip.h
index ae249e1..0b6b72f 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"