summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <anholt@freebsd.org>2003-12-01 01:46:42 +0000
committerEric Anholt <anholt@freebsd.org>2003-12-01 01:46:42 +0000
commitd221c484f9521c780fc3c7e88833c62e50463c6d (patch)
tree4c09207ee6cf85de8172b9416d81d8b99b85cd5a
parentd803918a9fb5f80a2d6e4b711d8e43916cd09da5 (diff)
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.
-rw-r--r--hw/kdrive/ati/ati_draw.c1
-rw-r--r--hw/kdrive/mach64/mach64.c1
-rw-r--r--hw/kdrive/src/vga.c2
3 files changed, 1 insertions, 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)