summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/radeon_lock.c
diff options
context:
space:
mode:
authorAapo Tahkola <aet@rasterburn.org>2005-10-26 17:04:15 +0000
committerAapo Tahkola <aet@rasterburn.org>2005-10-26 17:04:15 +0000
commit22605caea8af801185b7f4a64e3bb078b8712732 (patch)
tree53d21a421550d781a0d1145849f4d63e8a907fdb /src/mesa/drivers/dri/r300/radeon_lock.c
parent4dc3249f0d800f9e36ee11ec5c00351e67dbeee3 (diff)
Remove few outdated r200 files.
Diffstat (limited to 'src/mesa/drivers/dri/r300/radeon_lock.c')
-rw-r--r--src/mesa/drivers/dri/r300/radeon_lock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index 7400fd7839..430083ef01 100644
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -35,7 +35,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "r200_context.h"
#include "radeon_lock.h"
+#if R200_MERGED
#include "r200_tex.h"
+#endif
#include "r200_state.h"
#include "radeon_ioctl.h"
#include "radeon_state.h"