Merge commit 'origin/gallium-0.1'

[mesa.git] / src / mesa / swrast / s_texcombine.h

diff --git a/src/mesa/swrast/s_texcombine.h b/src/mesa/swrast/s_texcombine.h
index eca967c5404e07827d78ef73ba28aba0c00e79c4..9ed96efb879dfbdf2943e15ba65cebc108ef61da 100644 (file)
--- a/src/mesa/swrast/s_texcombine.h
+++ b/src/mesa/swrast/s_texcombine.h
@@ -27,10 +27,9 @@
 #define S_TEXCOMBINE_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 extern void
-_swrast_texture_span( GLcontext *ctx, struct sw_span *span );
+_swrast_texture_span( GLcontext *ctx, SWspan *span );
 
 #endif