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.
2003-12-01 01:46:42 +00:00 · 2003-12-01 01:46:42 +00:00 · d221c484f9
commit d221c484f9
parent d803918a9f
3 changed files with 1 additions and 3 deletions
--- 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>
--- 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)
--- 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)