diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-05-30 21:05:17 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-05-30 21:05:17 +0000 |
| commit | 71020f46ae684c420fbd81eb6599cf66da435fbb (patch) | |
| tree | 19955feb8332961ec94014a75fd906269a94c596 | |
| parent | 1906e66c028553b0c0e3cc7fb6e7cff0573857ea (diff) | |
Let this driver build with recent xservers too.
| -rw-r--r-- | driver/xf86-video-wsudl/src/wsudl_driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/driver/xf86-video-wsudl/src/wsudl_driver.c b/driver/xf86-video-wsudl/src/wsudl_driver.c index a073486f6..35699b1e4 100644 --- a/driver/xf86-video-wsudl/src/wsudl_driver.c +++ b/driver/xf86-video-wsudl/src/wsudl_driver.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsudl_driver.c,v 1.5 2009/09/27 18:19:28 mglocker Exp $ */ +/* $OpenBSD: wsudl_driver.c,v 1.6 2010/05/30 21:05:16 matthieu Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -76,8 +76,10 @@ #include "fb.h" +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "damage.h" @@ -354,9 +356,10 @@ WsudlPreInit(ScrnInfoPtr pScrn, int flags) fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); +#ifndef XSERVER_LIBPCIACCESS pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racIoFlags = pScrn->racMemFlags; - +#endif /* open wsdisplay device */ dev = xf86FindOptionValue(fPtr->pEnt->device->options, "device"); fPtr->fd = wsudl_open(dev); |