diff options
author | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
---|---|---|
committer | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
commit | cefee4e327c92daa2f01b6de650a43eddd348063 (patch) | |
tree | d1d25c4883357b12fd0c1deecc49cddc7e46976d /src/mesa/drivers/dri/r300/r300_emit.h | |
parent | d4dc2e30dada1be425e95ba270920db6eb210982 (diff) | |
parent | 7118db870091d4c9c2465e79f361ff0ed36d1f90 (diff) |
Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_emit.h')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_emit.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h index 8e57e354d1..a456d8867c 100644 --- a/src/mesa/drivers/dri/r300/r300_emit.h +++ b/src/mesa/drivers/dri/r300/r300_emit.h @@ -42,7 +42,6 @@ #include "main/glheader.h" #include "r300_context.h" #include "r300_cmdbuf.h" -#include "radeon_reg.h" static INLINE uint32_t cmdpacket0(struct radeon_screen *rscrn, int reg, int count) |