diff options
author | dawes <dawes> | 2000-11-30 18:49:38 +0000 |
---|---|---|
committer | dawes <dawes> | 2000-11-30 18:49:38 +0000 |
commit | 055ef92b0fcbf4afffd0a6b1e0593f3e9c44b623 (patch) | |
tree | c75c2f8883c8b6fff44f9c7b0aea55be7c4f3001 /xc/programs/Xserver/hw/xfree86/drivers/sis | |
parent | d129f7fd02961869422c111dd8c3cf824bc54243 (diff) |
XFree86 4.0.1f mergeX_4_0_1f-20001130-merge
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/sis')
-rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c index 7d72a139d..1ef028274 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c,v 1.6 2000/10/10 16:38:19 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis_dri.c,v 1.7 2000/11/09 11:32:21 alanh Exp $ */ /* modified from tdfx_dri.c, mga_dri.c */ @@ -9,11 +9,7 @@ #include "xf86PciInfo.h" #include "xf86Pci.h" -#define PSZ 8 -#include "cfb.h" -#undef PSZ -#include "cfb16.h" -#include "cfb32.h" +#include "fb.h" #include "miline.h" |