xorg: revert bad merge
authorZack Rusin <zackr@vmware.com>
Tue, 25 Aug 2009 13:55:42 +0000 (09:55 -0400)
committerZack Rusin <zackr@vmware.com>
Tue, 25 Aug 2009 13:58:51 +0000 (09:58 -0400)
commit65f9d10342881f8a6bc32ebc7976017cb4625a94
tree2b828dc919adc5ab28241557c25a7f6ece8c3c92
parentd22bd1421cdfa1900df5b76e6f862596bdd11074
xorg: revert bad merge
src/gallium/state_trackers/xorg/xorg_driver.c