diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-02-02 10:24:26 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2012-02-02 10:32:13 +0100 |
| commit | ecf6c5b1081e70ec64132a8188c8cc15945c2290 (patch) | |
| tree | 5eb5811b52cb69bc3cba424843cd5cdf7f1ab204 /src/vmware.c | |
| parent | 3e18d43c7f8ab5dcb94ac285a687eaaa1a578250 (diff) | |
vmware: Kill warnings on Xserver 1.12
Compile-tested on servers 1.0 through 1.12.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'src/vmware.c')
| -rw-r--r-- | src/vmware.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/vmware.c b/src/vmware.c index 5eb2bf9..e29822f 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -20,7 +20,6 @@ char rcsId_vmware[] = #include "compiler.h" /* inb/outb */ -#include "xf86PciInfo.h" /* pci vendor id */ #include "xf86Pci.h" /* pci */ #include "mipointer.h" /* sw cursor */ @@ -286,7 +285,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags) uint32 id; int i; ClockRange* clockRanges; - IOADDRESS domainIOBase = 0; + unsigned long domainIOBase = 0; uint32 width = 0, height = 0; Bool defaultMode; @@ -320,7 +319,7 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - if (DEVICE_ID(pVMWARE->PciInfo) == PCI_CHIP_VMWARE0710) { + if (DEVICE_ID(pVMWARE->PciInfo) == PCI_DEVICE_ID_VMWARE_SVGA) { pVMWARE->indexReg = domainIOBase + SVGA_LEGACY_BASE_PORT + SVGA_INDEX_PORT*sizeof(uint32); pVMWARE->valueReg = domainIOBase + |