summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2010-12-04 13:14:31 -0500
committerMatt Turner <mattst88@gmail.com>2010-12-04 13:14:31 -0500
commitd722b45848b899c5f4b7794871ef99207b8e7961 (patch)
treed2b2848bea82bf150665380921e375017e2bbca4
parent1b193cba02b6ca3e27bb72facaffcdd5fe57ba09 (diff)
unifdef XFree86LOADER
Signed-off-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/glint_driver.c4
-rw-r--r--src/pm2_video.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/glint_driver.c b/src/glint_driver.c
index bfd1ec8..ebe5c25 100644
--- a/src/glint_driver.c
+++ b/src/glint_driver.c
@@ -236,8 +236,6 @@ static RamDacSupportedInfoRec TIRamdacs[] = {
{ -1 }
};
-#ifdef XFree86LOADER
-
static MODULESETUPPROTO(glintSetup);
static XF86ModuleVersionInfo glintVersRec =
@@ -271,8 +269,6 @@ glintSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return NULL;
}
-#endif /* XFree86LOADER */
-
#define PARTPROD(a,b,c) (((a)<<6) | ((b)<<3) | (c))
static char bppand[4] = { 0x03, /* 8bpp */
diff --git a/src/pm2_video.c b/src/pm2_video.c
index df10bea..0c47d16 100644
--- a/src/pm2_video.c
+++ b/src/pm2_video.c
@@ -3073,7 +3073,7 @@ Permedia2VideoInit(ScreenPtr pScreen)
xf86InitFBManager(pScreen, &AvailFBArea);
}
-#if defined(XFree86LOADER) && 0
+#if 0
if (xf86LoaderCheckSymbol("xf86InitLinearFBManagerRegion")) {
int last = pGlint->FbMapSize / (pScrn->bitsPerPixel / 8) - 1;
BoxRec AvailFBArea;