From 035a824730ae3804b2bfaadec94015aac5c6ebcc Mon Sep 17 00:00:00 2001
From: keithw <keithw@keithw-laptop.(none)>
Date: Wed, 26 Sep 2007 12:10:46 +0100
Subject: fix merge

---
 src/mesa/pipe/draw/draw_feedback.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mesa/pipe/draw/draw_feedback.c b/src/mesa/pipe/draw/draw_feedback.c
index 15fad4da807..ee54db0ad5c 100644
--- a/src/mesa/pipe/draw/draw_feedback.c
+++ b/src/mesa/pipe/draw/draw_feedback.c
@@ -69,8 +69,6 @@ static void
 feedback_vertex(struct draw_stage *stage, const struct vertex_header *vertex)
 {
    struct feedback_stage *fs = (struct feedback_stage *) stage;
-
-#if 0
    const struct pipe_feedback_state *feedback = &stage->draw->feedback;
    const uint select = feedback->interleaved ? 0 : 1;
    uint i;
-- 
cgit v1.2.3