Fix more merge fallout
authorAlex Deucher <alexdeucher@gmail.com>
Thu, 16 Jul 2009 06:59:36 +0000 (02:59 -0400)
committerAlex Deucher <alexdeucher@gmail.com>
Thu, 16 Jul 2009 06:59:36 +0000 (02:59 -0400)
commit11606e873d38a320195ab4e23181579f766ae45c
tree2bcdd79d5d8864ebc4a2c8b4be6730042ffd64ee
parent92a2f0164aece1584e7c4ea8c5c44af43a1de8c3
Fix more merge fallout
src/mesa/drivers/dri/r600/r600_cmdbuf.c
src/mesa/drivers/dri/radeon/radeon_bo_legacy.h