From 1dec1a58dbac91deeddab0807c566d48154b7b57 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Mon, 23 Feb 2004 21:35:25 +0000
Subject: merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214

---
 src/ct_bank.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/ct_bank.c')

diff --git a/src/ct_bank.c b/src/ct_bank.c
index 1e478ee..3896457 100644
--- a/src/ct_bank.c
+++ b/src/ct_bank.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c,v 1.6 2002/01/25 21:55:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c,v 1.7 2003/12/31 06:14:36 dawes Exp $ */
 
 /*
  * Copyright 1997
@@ -53,12 +53,15 @@
 /* Driver specific headers */
 #include "ct_driver.h"
 
-#ifdef	__arm32__
-/*#include <machine/sysarch.h>*/
+#if defined(__arm32__) && defined(__NetBSD__)
+#include <machine/sysarch.h>
 #define	arm32_drain_writebuf()	sysarch(1, 0)
-#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank
+#elif defined(__arm32__)
+#define arm32_drain_writebuf()
 #endif
 
+#define ChipsBank(pScreen) CHIPSPTR(xf86Screens[pScreen->myNum])->Bank
+
 #ifdef DIRECT_REGISTER_ACCESS
 int
 CHIPSSetRead(ScreenPtr pScreen, int bank)
-- 
cgit v1.2.3