hw/kdrive/*/Makefile.am Libraries in local dir must not use global path or

make doesn't build things in the right order (-j)
hw/kdrive/mga/mga.h, mgadraw.c Fix warnings

hw/kdrive/mga/Makefile.am

@@ -2,6 +2,7 @@ INCLUDES = 					\
 	-I$(top_srcdir)/fb			\
 	-I$(top_srcdir)/hw/kdrive/src		\
 	-I$(top_srcdir)/hw/kdrive/vesa		\
+	-I$(top_srcdir)/hw/kdrive/linux		\
 	-I$(top_srcdir)/include			\
 	-I$(top_srcdir)/mi			\
 	-I$(top_srcdir)/miext/layer		\
@@ -23,7 +24,7 @@ Xmga_SOURCES = \
 	mgastub.c
 
 Xmga_LDADD = \
-	$(top_builddir)/hw/kdrive/mga/libmga.a \
+	libmga.a 				\
 	$(top_builddir)/hw/kdrive/vesa/libvesa.a \
 	$(top_builddir)/dix/libdix.a		\
 	$(top_builddir)/os/libos.a		\

hw/kdrive/mga/mga.h

@@ -26,6 +26,7 @@
 #ifndef _MGA_H_
 #define _MGA_H_
 #include <vesa.h>
+#include <klinux.h>
 
 #define MGA_REG_BASE(c)	    ((c)->attr.address[1])
 #define MGA_REG_SIZE(c)	    (0x4000)

hw/kdrive/mga/mgadraw.c

@@ -213,9 +213,6 @@ KaaScreenInfoRec mgaKaa = {
 Bool
 mgaDrawInit (ScreenPtr pScreen)
 {
-    KdScreenPriv(pScreen);
-    mgaScreenInfo (pScreenPriv);
-    
     if (!kaaDrawInit (pScreen, &mgaKaa))
 	return FALSE;