i965: fix an overlooked merge conflict
authorBrian Paul <brianp@vmware.com>
Wed, 9 Sep 2009 15:24:38 +0000 (09:24 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 9 Sep 2009 15:24:38 +0000 (09:24 -0600)
commit4d85a6b393503c8e859ff9bcd5011ec5e65ba2b9
treedaa50f79ce022c2273fca4a881ac61e6e8ced58e
parent49c230709cfc588deea19f9ec21763ee00b81e6a
i965: fix an overlooked merge conflict
src/mesa/drivers/dri/intel/intel_pixel_read.c