From d221c484f9521c780fc3c7e88833c62e50463c6d Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Mon, 1 Dec 2003 01:46:42 +0000
Subject: [PATCH] Remove sys/io.h inclusion from some files that didn't need
 it, and change     asm/io.h to sys/io.h in vga.c, which newer Linux complains
 about.

---
 hw/kdrive/ati/ati_draw.c  | 1 -
 hw/kdrive/mach64/mach64.c | 1 -
 hw/kdrive/src/vga.c       | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c
index bd38831bc..c1da03cbe 100644
--- a/hw/kdrive/ati/ati_draw.c
+++ b/hw/kdrive/ati/ati_draw.c
@@ -22,7 +22,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 /* $Header$ */
-#include <sys/io.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c
index 3d24045da..c093ef83c 100644
--- a/hw/kdrive/mach64/mach64.c
+++ b/hw/kdrive/mach64/mach64.c
@@ -25,7 +25,6 @@
 #include <config.h>
 #endif
 #include "mach64.h"
-#include <sys/io.h>
 
 static Bool
 mach64CardInit (KdCardInfo *card)
diff --git a/hw/kdrive/src/vga.c b/hw/kdrive/src/vga.c
index 7975d5c5c..3e7a43ee9 100644
--- a/hw/kdrive/src/vga.c
+++ b/hw/kdrive/src/vga.c
@@ -32,7 +32,7 @@
 #ifdef linux
 #ifdef __i386__
 #define extern static
-#include <asm/io.h>
+#include <sys/io.h>
 #undef extern
 
 #define _VgaInb(r)	inb(r)