Fix merge error.
authorKeith Whitwell <keith@tungstengraphics.com>
Wed, 22 Dec 2004 19:31:10 +0000 (19:31 +0000)
committerKeith Whitwell <keith@tungstengraphics.com>
Wed, 22 Dec 2004 19:31:10 +0000 (19:31 +0000)
commit15da29b5e74a92437b9dc95590a9289e33e0a9a6
treee006f601e134eecb1122431a7b2873073d3e03eb
parent7db50bb3a893ba0ec0ec2fe1ec54a07ff6472435
Fix merge error.
src/mesa/drivers/dri/unichrome/via_ioctl.c