From b1013f68a8c4878f40ef608f87a2bacdbdf02768 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Mon, 1 Mar 2004 15:06:44 +0000 Subject: 3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich). 2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich). 1. First add of SUN's XIVIE extension (Stuart Kreitman). --- src/ct_bank.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 */ +#if defined(__arm32__) && defined(__NetBSD__) +#include #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