Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / gallium / auxiliary / tgsi / tgsi_opcode_tmp.h

diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
index ed594a3e2c7748b2fbd9b5dc5c13052a4d1d1137..e7bcf4bf7543c154b7ee2c8232fbe2c52d02c5f1 100644 (file)
--- a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h
@@ -60,7 +60,6 @@ OP13(MAD)
 OP12(SUB)
 OP13(LRP)
 OP13(CND)
-OP13(CND0)
 OP13(DP2A)
 OP11(FRC)
 OP13(CLAMP)