*** xf86dri.xml.orig	2008-11-21 08:24:16.000000000 -0800
--- xf86dri.xml	2008-11-21 08:26:53.000000000 -0800
***************
*** 62,69 ****
  	<field type="CARD32" name="screen" />
  	<reply>
  	    <pad bytes="1" />
- 	    <field type="CARD32" name="drm_client_key_low" />
- 	    <field type="CARD32" name="drm_client_key_high" />
  	    <field type="CARD32" name="sarea_handle_low" />
  	    <field type="CARD32" name="sarea_handle_high" />
  	    <field type="CARD32" name="bus_id_len" />
--- 62,67 ----
***************
*** 94,101 ****
      </request>
  
      <request name="CreateContext" opcode="5">
- 	<field type="CARD32" name="visual" />
  	<field type="CARD32" name="screen" />
  	<field type="CARD32" name="context" />
  	<reply>
  	    <pad bytes="1" />
--- 92,99 ----
      </request>
  
      <request name="CreateContext" opcode="5">
  	<field type="CARD32" name="screen" />
+ 	<field type="CARD32" name="visual" />
  	<field type="CARD32" name="context" />
  	<reply>
  	    <pad bytes="1" />