summaryrefslogtreecommitdiff
path: root/src/savage_dri.c
diff options
context:
space:
mode:
authorIan Romanick <idr@umwelt.(none)>2006-08-08 16:49:51 -0700
committerIan Romanick <idr@umwelt.(none)>2006-08-08 16:49:51 -0700
commitf2191d412832312b494f313841d094f87f64a5ff (patch)
tree846efea1cd9b0e1ca473b4e58d9efa4859d843d8 /src/savage_dri.c
parent5108d1dd581a6e649f89812affba8481491e1bd7 (diff)
Minimal change set to convert driver to the new PCI interfaces. Enjoy.
Diffstat (limited to 'src/savage_dri.c')
-rw-r--r--src/savage_dri.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/savage_dri.c b/src/savage_dri.c
index b55573e..432df3d 100644
--- a/src/savage_dri.c
+++ b/src/savage_dri.c
@@ -460,8 +460,8 @@ static Bool SAVAGEDRIAgpInit(ScreenPtr pScreen)
xf86DrvMsg( pScreen->myNum, X_INFO,
"[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x]\n",
mode, vendor, device,
- psav->PciInfo->vendor,
- psav->PciInfo->chipType );
+ psav->PciInfo->vendor_id,
+ psav->PciInfo->device_id );
if ( drmAgpEnable( psav->drmFD, mode ) < 0 ) {
xf86DrvMsg( pScreen->myNum, X_ERROR, "[agp] AGP not enabled\n" );
@@ -875,7 +875,7 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
sprintf(pDRIInfo->busIdString,
"PCI:%d:%d:%d",
psav->PciInfo->bus,
- psav->PciInfo->device,
+ psav->PciInfo->dev,
psav->PciInfo->func);
}
pDRIInfo->ddxDriverMajorVersion = SAVAGE_VERSION_MAJOR;