From 308f52d57341bc864baf619ac0fbc2b33f5cc5a5 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 9 Jul 2010 18:09:26 -0700
Subject: 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.
---
 src/mesa/drivers/dri/r600/r700_chip.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/drivers')

diff --git a/src/mesa/drivers/dri/r600/r700_chip.h b/src/mesa/drivers/dri/r600/r700_chip.h
index ae249e15fd..0b6b72f850 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"
-- 
cgit v1.2.3