diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:25 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:35:25 +0000 |
| commit | 1dec1a58dbac91deeddab0807c566d48154b7b57 (patch) | |
| tree | c0395a527fa55b8af7d01d0457a2d8c89a37f060 /src | |
| parent | a6dbf328e124511ea2b4dc796f6b67dd919bf839 (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src')
| -rw-r--r-- | src/ct_bank.c | 11 |
1 files 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 <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) |