summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2014-09-21 09:51:37 +1000
committerDave Airlie <airlied@gmail.com>2014-09-21 09:51:37 +1000
commit6661bdd4551e4e63e983685464a277845aed3012 (patch)
treeb04cf7aa3f88c9113cdd1d2756eaf020a5f4b654 /src
parent74a9a343f6e156d24539b81f1224b7410acf0e38 (diff)
neomagic: fix build against master X server.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/neo_driver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/neo_driver.c b/src/neo_driver.c
index 1b0da34..da01962 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -1994,10 +1994,12 @@ neoMapMem(ScrnInfoPtr pScrn)
}
#endif
} else
+#ifdef VIDMEM_MMIO
nPtr->NeoMMIOBase =
xf86MapVidMem(pScrn->scrnIndex,
VIDMEM_MMIO, nPtr->NeoMMIOAddr,
0x200000L);
+#endif
if (nPtr->NeoMMIOBase == NULL)
return FALSE;
}
@@ -2024,10 +2026,12 @@ neoMapMem(ScrnInfoPtr pScrn)
}
#endif
else
+#ifdef VIDMEM_FRAMEBUFFER
nPtr->NeoFbBase =
xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
(unsigned long)nPtr->NeoLinearAddr,
nPtr->NeoFbMapSize);
+#endif
if (nPtr->NeoFbBase == NULL)
return FALSE;
return TRUE;