blob: 638de08f6bffba7e067c9c680f65a61b2eeb987b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From d09a6fb491439814f5b746d0e749e956f6563a80 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 17 Apr 2010 10:46:10 +0200
Subject: [PATCH 1/3] s3c64xx: update for resources/RAC API removal
---
src/s3c64xx_driver.c | 4 ++++
src/s3c64xx_xaa.c | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/s3c64xx_driver.c b/src/s3c64xx_driver.c
index 4455b14..f31776b 100644
--- a/src/s3c64xx_driver.c
+++ b/src/s3c64xx_driver.c
@@ -59,8 +59,10 @@
#include "xf86cmap.h"
#include "dgaproc.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
#include "xf86RAC.h"
+#endif
/* RandR rotate */
#include "X11/extensions/randr.h"
@@ -420,9 +422,11 @@ S3CDevPreInit(ScrnInfoPtr pScrn, int flags)
pS3CDEV->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#ifndef XSERVER_LIBPCIACCESS
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
/* XXX Is this right? Can probably remove RAC_FB */
pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+#endif
/* open device */
if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(pS3CDEV->pEnt->device->options,"s3c64xx")))
diff --git a/src/s3c64xx_xaa.c b/src/s3c64xx_xaa.c
index 16cb476..e62c37c 100644
--- a/src/s3c64xx_xaa.c
+++ b/src/s3c64xx_xaa.c
@@ -57,7 +57,9 @@
#include "xaa.h"
#include "xaarop.h"
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#endif
/*
** suspend/resume fails unless you have a correctly restoring register state
--
1.6.6.1
|
