diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:36 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:36 +1000 |
| commit | 70f2463faa6d21517d97aa460871e1b5f3fa6505 (patch) | |
| tree | 923c2a3c2d03da416d93c33668f6069ba2858586 | |
| parent | 841df790b5b6700e9a1d6d41ee04b0b913329084 (diff) | |
siliconmotion: update for resources/RAC API removal
| -rw-r--r-- | src/smi_driver.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/smi_driver.c b/src/smi_driver.c index b9b7b18..9c07f61 100644 --- a/src/smi_driver.c +++ b/src/smi_driver.c @@ -31,12 +31,16 @@ authorization from The XFree86 Project or Silicon Motion. #include "config.h" #endif -#include "xf86Resources.h" -#include "xf86RAC.h" + #include "xf86DDC.h" #include "xf86int10.h" #include "vbe.h" +#ifndef XSERVER_LIBPCIACCESS +#include "xf86Resources.h" +#include "xf86RAC.h" +#endif + #include "smi.h" #include "smi_501.h" #include "smilynx.h" @@ -416,7 +420,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) LEAVE(TRUE); } - if (pEnt->location.type != BUS_PCI || pEnt->resources) { + if (pEnt->location.type != BUS_PCI) { xfree(pEnt); SMI_FreeRec(pScrn); LEAVE(FALSE); @@ -626,10 +630,9 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags) } } +#ifndef XSERVER_LIBPCIACCESS xf86RegisterResources(pEnt->index, NULL, ResExclusive); -/* xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr); */ -/* xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr); */ - +#endif /* * Set the Chipset and ChipRev, allowing config file entries to * override. |