summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2009-09-13 22:21:03 +0200
committerMatthieu Herrb <matthieu.herrb@laas.fr>2009-09-13 22:25:28 +0200
commitffe84aa5f99cb95467c86fc914724496cab53952 (patch)
treef112e3927349200cff155eb68db4bfda9fe2df81
parent23ca8d8f9bc90ced9102c51ca588dab16956293b (diff)
wsfb: update for resources/RAC API removal
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-rw-r--r--src/wsfb_driver.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wsfb_driver.c b/src/wsfb_driver.c
index 588a15b..f5f486a 100644
--- a/src/wsfb_driver.c
+++ b/src/wsfb_driver.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfb_driver.c,v 1.14 2008/09/29 22:04:43 matthieu Exp $ */
+/* $OpenBSD: wsfb_driver.c,v 1.15 2009/06/01 20:57:20 matthieu Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* All rights reserved.
@@ -68,8 +68,10 @@
#endif
#include "fb.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
+#endif
#ifdef XvExtension
#include "xf86xv.h"
@@ -416,8 +418,10 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags)
fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn->racIoFlags = pScrn->racMemFlags;
+#endif
dev = xf86FindOptionValue(fPtr->pEnt->device->options, "device");
fPtr->fd = wsfb_open(dev);