summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorMaciej Cencora <[email protected]>2010-07-12 23:42:06 +0200
committerMaciej Cencora <[email protected]>2010-07-12 23:42:06 +0200
commit7facb8f2c8aa4a59aac20bd571f76097634092e9 (patch)
tree8afcbe9ca0ad20fa0355b9ae328b5f658d9e4c38 /src/mesa
parentba03a0b5ba73bc8e79d0ffa6d1da623544716f74 (diff)
parentc6b7aa96f9c1f2cf5d23512e808ee4023fc2674d (diff)
Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r600/r700_oglprog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r600/r700_oglprog.h b/src/mesa/drivers/dri/r600/r700_oglprog.h
index fe2e9d19749..4d421338678 100644
--- a/src/mesa/drivers/dri/r600/r700_oglprog.h
+++ b/src/mesa/drivers/dri/r600/r700_oglprog.h
@@ -27,7 +27,7 @@
#ifndef _R700_OGLPROG_H_
#define _R700_OGLPROG_H_
-#include "r600_context.h"
+#include "main/dd.h"
extern void r700InitShaderFuncs(struct dd_function_table *functions);