summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2011-10-16 15:12:54 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2011-10-16 15:12:54 -0700
commit4cf15cbff44217d0ef50fc9b2b1ace936becd010 (patch)
treec7b43ef1de720c060476e09c39feb82f24d9e425
parent3a26fe8fcef9ce36036de58570ab0b0f268ae596 (diff)
Fix a couple of compilation errors.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/cyrix.h2
-rw-r--r--src/cyrix_driver.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cyrix.h b/src/cyrix.h
index 162b009..04435e8 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -110,7 +110,7 @@ typedef struct {
int CYRIXbltBufSize;
EntityInfoPtr pEnt;
unsigned char * FbBase;
- pciVideoPtr PciInfo;
+ struct pci_device * PciInfo;
XAAInfoRecPtr AccelInfoRec;
xf86CursorInfoPtr CursorInfoRec;
CloseScreenProcPtr CloseScreen;
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 25df555..2261487 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -455,7 +455,7 @@ CYRIXProbe(DriverPtr drv, int flags)
if ((pScrn = xf86ConfigIsaEntity(pScrn, 0, usedChips[i],
CYRIXISAChipsets, NULL,
NULL, NULL, NULL, NULL))){
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = CYRIX_VERSION;
pScrn->driverName = CYRIX_DRIVER_NAME;
pScrn->name = CYRIX_NAME;
pScrn->Probe = CYRIXProbe;