diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-17 12:44:24 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-17 12:44:24 +0200 |
| commit | 2a661c383fee65bc4413541e706925fa3e9b9cf5 (patch) | |
| tree | dbea0c9d65d17b81720fe2f161604dfc91eb0546 /src/mesa/drivers/dri/radeon/radeon_common_context.c | |
| parent | 90daefd1c474a6e0502df5053b581987c12b8673 (diff) | |
| parent | 21caa29fbd332a2ee05a58df91e1664fbbc4e61f (diff) | |
Merge commit 'origin/master' into glsl-pp-rework-2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_common_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_common_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c index 71ee06d9a7..1c53c04da7 100644 --- a/src/mesa/drivers/dri/radeon/radeon_common_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c @@ -47,7 +47,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "swrast_setup/swrast_setup.h" #include "tnl/tnl.h" -#if RADEON_COMMON && defined(RADEON_COMMON_FOR_R600) /* +r6/r7 */ +#if defined(RADEON_R600) #include "r600_context.h" #endif |