Enable i810.

hw/kdrive/Makefile.am

@@ -17,4 +17,5 @@ SUBDIRS =			\
 	$(FBDEV_SUBDIRS)	\
 	$(VESA_SUBDIRS)		\
 	ati			\
-	fake
+	fake			\
+	i810

hw/kdrive/i810/Makefile.am

@@ -0,0 +1,34 @@
+INCLUDES = 					\
+	@KDRIVE_INCS@				\
+	@XSERVER_CFLAGS@
+
+bin_PROGRAMS = Xi810
+
+noinst_LIBRARIES = libi810.a
+
+if TSLIB
+TSLIB_FLAG = -lts
+endif
+
+libi810_a_SOURCES = 		\
+	i810_cursor.c	\
+	i810_video.c	\
+	i810draw.c	\
+	i810draw.h	\
+	i810reg.h	\
+	i810.c		\
+	i810.h
+
+Xi810_SOURCES = \
+	i810stub.c
+
+I810_LIBS =						\
+	libi810.a 					\
+	@KDRIVE_LIBS@
+
+Xi810_LDADD = \
+	$(I810_LIBS)					\
+	@XSERVER_LIBS@                                  \
+	$(TSLIB_FLAG)
+
+Xi810_DEPENDENCIES = $(I810_LIBS) @KDRIVE_LIBS@

hw/kdrive/i810/i810.c

@@ -49,7 +49,7 @@ X Window System is a trademark of The Open Group */
 #include "kxv.h"
 
 #include "i810.h"
-#include "linux/agp.h"
+#include "agp.h"
 
 #include "i810draw.h"
 

hw/kdrive/i810/i810_video.c

@@ -75,9 +75,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "kxv.h"
 #include "i810.h"
 
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 
-#include "../../xfree86/common/fourcc.h"
+#include "fourcc.h"
 
 typedef struct {
     CARD32 size;

hw/kdrive/i810/i810draw.c

@@ -45,7 +45,7 @@ X Window System is a trademark of The Open Group */
 #include "i810.h"
 #include "i810_reg.h"
 
-#include	"Xmd.h"
+//#include	"Xmd.h"
 #include	"gcstruct.h"
 #include	"scrnintstr.h"
 #include	"pixmapstr.h"