i965: Delete the BATCH_LOCALS macro.

[mesa.git] / src / gallium / targets / xorg-nouveau / nouveau_xorg.c

diff --git a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
index 43470a1656bf9b3a3faeb65aacd4c2b85314286c..2324d24445ae56d28386ad57b1d44783a4d6b339 100644 (file)
--- a/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
+++ b/src/gallium/targets/xorg-nouveau/nouveau_xorg.c
@@ -29,8 +29,8 @@
  */
 
 #include "../../state_trackers/xorg/xorg_winsys.h"
-#include <nouveau_drmif.h>
-#include <xorg/dri.h>
+#include <nouveau.h>
+#include <dri.h>
 #include <xf86drmMode.h>
 
 static void nouveau_xorg_identify(int flags);
@@ -139,7 +139,7 @@ nouveau_xorg_pci_probe(DriverPtr driver,
     }
     busid = DRICreatePCIBusID(device);
 
-    ret = nouveau_device_open(&dev, busid);
+    ret = nouveau_device_open(busid, &dev);
     if (ret) {
        xf86DrvMsg(-1, X_ERROR, "[drm] failed to open device\n");
        free(busid);
@@ -147,7 +147,7 @@ nouveau_xorg_pci_probe(DriverPtr driver,
     }
 
     chipset = dev->chipset;
-    nouveau_device_close(&dev);
+    nouveau_device_del(&dev);
 
     ret = drmCheckModesettingSupported(busid);
     free(busid);