xserver/hw/xizzle/drivers/ati Makefile.am, 1.3, 1.4 atimach64.c, 1.54, 1.55 atimach64xv.c, 1.9, 1.10 atiscreen.c, 1.32, 1.33 ativga.c, 1.22, 1.23

[Carlos Romero]

Committed by: kidcrash

Update of /cvs/xserver/xserver/hw/xizzle/drivers/ati
In directory pdx:/tmp/cvs-serv19965/hw/xizzle/drivers/ati

Modified Files:
	Makefile.am atimach64.c atimach64xv.c atiscreen.c ativga.c 
Log Message:
Xizzle server build fixes


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/drivers/ati/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/Makefile.am	18 Mar 2004 23:27:53 -0000	1.3
+++ b/Makefile.am	19 Mar 2004 05:49:58 -0000	1.4
@@ -15,6 +15,7 @@
            -I$(top_srcdir)/hw/xizzle/Xi \
 	   -I$(top_srcdir)/hw/xizzle/xaa \
 	   -I$(top_srcdir)/hw/xizzle/ramdac \
+	   -I$(top_srcdir)/hw/xizzle/shadowfb \
 	   -I$(top_srcdir)/os
 
 lib_LIBRARIES = libati.a

Index: atimach64.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/drivers/ati/atimach64.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- a/atimach64.c	28 Feb 2004 01:27:38 -0000	1.54
+++ b/atimach64.c	19 Mar 2004 05:49:58 -0000	1.55
@@ -36,7 +36,7 @@
 #ifndef DPMS_SERVER
 # define DPMS_SERVER
 #endif
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 
 /*
  * ATIMach64PreInit --

Index: atimach64xv.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/drivers/ati/atimach64xv.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/atimach64xv.c	28 Feb 2004 01:27:38 -0000	1.9
+++ b/atimach64xv.c	19 Mar 2004 05:49:58 -0000	1.10
@@ -31,7 +31,7 @@
 #include "atimach64io.h"
 #include "atimach64xv.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "fourcc.h"
 
 #define MAKE_ATOM(string) MakeAtom(string, strlen(string), TRUE)

Index: atiscreen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/drivers/ati/atiscreen.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- a/atiscreen.c	28 Feb 2004 01:27:38 -0000	1.32
+++ b/atiscreen.c	19 Mar 2004 05:49:58 -0000	1.33
@@ -37,8 +37,8 @@
 #include "shadowfb.h"
 #include "xf86cmap.h"
 
-#include "xf1bpp.h"
-#include "xf4bpp.h"
+/*#include "xf1bpp.h"*/
+/*#include "xf4bpp.h"*/
 
 #include "fb.h"
 
@@ -141,7 +141,7 @@
     switch (pATI->bitsPerPixel)
     {
 
-#ifndef AVOID_CPIO
+#if 0
 
         case 1:
             pATI->Closeable = xf1bppScreenInit(pScreen, pFB,

Index: ativga.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xizzle/drivers/ati/ativga.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- a/ativga.c	28 Feb 2004 01:27:38 -0000	1.22
+++ b/ativga.c	19 Mar 2004 05:49:58 -0000	1.23
@@ -35,7 +35,7 @@
 #ifndef DPMS_SERVER
 # define DPMS_SERVER
 #endif
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
 
 #ifndef AVOID_CPIO