diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:41 +1000 |
| commit | 4605e8d3a99ddcd75314051bd00b51d8ecee06a1 (patch) | |
| tree | 849f24aa16be481da58d38b537c7e6219456a85a /src | |
| parent | 382c25f53870da0db0ee74f343c20c312e6b03af (diff) | |
vmware: update for resources/RAC API removal
Diffstat (limited to 'src')
| -rw-r--r-- | src/vmware.c | 6 | ||||
| -rw-r--r-- | src/vmware.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/vmware.c b/src/vmware.c index 2d1eabd..b1a9070 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -18,7 +18,9 @@ char rcsId_vmware[] = #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" +#endif #include "compiler.h" /* inb/outb */ @@ -109,11 +111,15 @@ static SymTabRec VMWAREChipsets[] = { { -1, NULL } }; +#ifndef XSERVER_LIBPCIACCESS static resRange vmwareLegacyRes[] = { { ResExcIoBlock, SVGA_LEGACY_BASE_PORT, SVGA_LEGACY_BASE_PORT + SVGA_NUM_PORTS*sizeof(uint32)}, _VGA_EXCLUSIVE, _END }; +#else +static int vmwareLegacyRes = 0; +#endif #if XSERVER_LIBPCIACCESS diff --git a/src/vmware.h b/src/vmware.h index a3502dd..31560b5 100644 --- a/src/vmware.h +++ b/src/vmware.h @@ -19,12 +19,14 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" + #include <X11/extensions/panoramiXproto.h> #ifdef XSERVER_LIBPCIACCESS #include <pciaccess.h> +#else +#include "xf86Resources.h" #endif #include "compiler.h" /* inb/outb */ |