Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / gallium / drivers / failover / fo_context.c

diff --git a/src/gallium/drivers/failover/fo_context.c b/src/gallium/drivers/failover/fo_context.c
index 014a3e31d5055a3cb27792a609f60264380aa7b8..10c4ffc2096cba653868ef9ca5af238efa4fd97b 100644 (file)
--- a/src/gallium/drivers/failover/fo_context.c
+++ b/src/gallium/drivers/failover/fo_context.c
@@ -28,7 +28,7 @@
 
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
-#include "pipe/p_util.h"
+#include "util/u_memory.h"
 #include "pipe/p_context.h"
 
 #include "fo_context.h"