mesa: Branch 'master' - 2 commits

[Nan hai Zou]

 src/mesa/drivers/dri/i965/brw_program.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree da82d86ea00fa05d8483e25618a0150bc0ee8a6c (from parents)
Merge: 075d3d892f303c26c61566f2b0f0a6df0013a34f ae36cfc65eac19281b5ad338e4095008dc69ab21
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Mar 27 09:41:31 2007 +0800

    Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa

diff-tree 075d3d892f303c26c61566f2b0f0a6df0013a34f (from c3da0bd7dde9febf206efac88bb67e98dfc90baa)
Author: Zou Nan hai <nanhai.zou at intel.com>
Date:   Tue Mar 27 09:41:01 2007 +0800

      Fix compile error

diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 5d98176..752fe49 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -29,7 +29,7 @@
   *   Keith Whitwell <keith at tungstengraphics.com>
   */
   
-
+#include "shader/prog_parameter.h"
 #include "brw_context.h"
 #include "brw_aub.h"
 #include "brw_util.h"