From 4e823197332604ca652ae6be21583725313f9f3d Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Wed, 25 Aug 2010 00:52:34 -0700
Subject: [PATCH] nvfx: Clean up header file inclusion in nvfx_screen.h.

Remove nvfx_context.h.
Include p_compiler.h for INLINE symbol.

Fixes nvfx_context.h -> nvfx_screen.h -> nvfx_context.h include recursion.
---
 src/gallium/drivers/nvfx/nvfx_screen.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvfx/nvfx_screen.h b/src/gallium/drivers/nvfx/nvfx_screen.h
index 473a1127752..1b79235ae0d 100644
--- a/src/gallium/drivers/nvfx/nvfx_screen.h
+++ b/src/gallium/drivers/nvfx/nvfx_screen.h
@@ -1,11 +1,11 @@
 #ifndef __NVFX_SCREEN_H__
 #define __NVFX_SCREEN_H__
 
+#include "pipe/p_compiler.h"
 #include "util/u_double_list.h"
 #include "nouveau/nouveau_screen.h"
-#include "nvfx_context.h"
 
-struct nv04_2d_context;
+struct pipe_screen;
 
 struct nvfx_screen {
 	struct nouveau_screen base;
-- 
2.30.2