summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-07-28 13:32:28 +1000
committerDave Airlie <airlied@redhat.com>2009-07-28 13:32:28 +1000
commitc2d90960dcd57b1380266188ca7155e981b50bb9 (patch)
tree39709ff0816497c7893f6af6ef85d9b4aa2d9abb
parent09347dfc78b7f291313057863976bf4b679362d1 (diff)
apm: update for resources/RAC API removal
-rw-r--r--src/apm_driver.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/apm_driver.c b/src/apm_driver.c
index f9420a3..3939dac 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -6,9 +6,7 @@
#include "apm.h"
#include "xf86cmap.h"
#include "shadowfb.h"
-#include "xf86Resources.h"
#include "xf86int10.h"
-#include "xf86RAC.h"
#include "vbe.h"
#include "opaque.h"
@@ -788,14 +786,6 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(ptr);
}
- xf86RegisterResources(pEnt->index, NULL, ResNone);
- xf86SetOperatingState(resVga, pEnt->index, ResDisableOpr);
- pScrn->racMemFlags = 0; /* For noLinear, access to 0xA0000 */
- if (pApm->VGAMap)
- pScrn->racIoFlags = 0;
- else
- pScrn->racIoFlags = RAC_COLORMAP | RAC_VIEWPORT;
-
if (pEnt->device->videoRam != 0) {
pScrn->videoRam = pEnt->device->videoRam;
from = X_CONFIG;