From: Eric Anholt <eric@anholt.net>
Date: Mon, 14 Dec 2015 20:25:28 +0000 (-0800)
Subject: vc4: Fix min() wrapper definition for the simulator's kernel code.
X-Git-Tag: upstream/17.1.0~13660
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da92f16c500642879221b201a8292080236b4251;p=platform%2Fupstream%2Fmesa.git

vc4: Fix min() wrapper definition for the simulator's kernel code.
---

diff --git a/src/gallium/drivers/vc4/vc4_simulator_validate.h b/src/gallium/drivers/vc4/vc4_simulator_validate.h
index 40d3ada..e1f8b5a 100644
--- a/src/gallium/drivers/vc4/vc4_simulator_validate.h
+++ b/src/gallium/drivers/vc4/vc4_simulator_validate.h
@@ -45,7 +45,7 @@ struct vc4_exec_info;
 #define roundup(x, y) align(x, y)
 #define round_up(x, y) align(x, y)
 #define max(x, y) MAX2(x, y)
-#define min(x, y) MiN2(x, y)
+#define min(x, y) MIN2(x, y)
 #define BUG_ON(condition) assert(!(condition))
 
 static inline int