--- xf86-video-r128-6.8.1/src/r128_video.c.orig	2010-09-11 19:53:04.000000000 +0000
+++ xf86-video-r128-6.8.1/src/r128_video.c	2010-09-11 19:59:18.000000000 +0000
@@ -408,9 +408,9 @@ R128ResetVideo(ScrnInfoPtr pScrn)
     xvDeviceID = MAKE_ATOM("XV_DEVICE_ID");
     xvLocationID = MAKE_ATOM("XV_LOCATION_ID");
     
-    sprintf(tmp, "RXXX:%d.%d.%d", info->PciInfo->vendor, info->PciInfo->chipType, info->PciInfo->chipRev);
+    sprintf(tmp, "RXXX:%d.%d.%d", PCI_DEV_VENDOR_ID(info->PciInfo), PCI_DEV_DEVICE_ID(info->PciInfo), PCI_DEV_REVISION(info->PciInfo));
     pPriv->device_id = MAKE_ATOM(tmp);
-    sprintf(tmp, "PCI:%02d:%02d.%d", info->PciInfo->bus, info->PciInfo->device, info->PciInfo->func);
+    sprintf(tmp, "PCI:%02d:%02d.%d", PCI_DEV_BUS(info->PciInfo), PCI_DEV_DEV(info->PciInfo), PCI_DEV_FUNC(info->PciInfo));
     pPriv->location_id = MAKE_ATOM(tmp);
     sprintf(tmp, "INSTANCE:%d", pScrn->scrnIndex);
     pPriv->instance_id = MAKE_ATOM(tmp);