7 files changed, 13 insertions, 17 deletions
diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c
index f8e856a..460626c 100644
--- a/sys/dev/atkbdc/atkbdc.c
+++ b/sys/dev/atkbdc/atkbdc.c
@@ -174,10 +174,8 @@ atkbdc_configure(void)
 #endif
 
 	/* XXX: tag should be passed from the caller */
-#if defined(__i386__)
-	tag = I386_BUS_SPACE_IO;
-#elif defined(__amd64__)
-	tag = AMD64_BUS_SPACE_IO;
+#if defined(__amd64__) || defined(__i386__)
+	tag = X86_BUS_SPACE_IO;
 #elif defined(__ia64__)
 	tag = IA64_BUS_SPACE_IO;
 #elif defined(__sparc64__)
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index a2cb24e..604e8df 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -6261,8 +6261,8 @@ int if_lmc_lkmentry(struct lkm_table *lkmtp, int cmd, int ver)
         /* XXX Why isn't there an LKM network interface module?    XXX */
         pa.pa_pc    = NULL;					/* XXX */
         pa.pa_bus   = 0;					/* XXX */
-        pa.pa_iot   = I386_BUS_SPACE_IO;			/* XXX */
-        pa.pa_memt  = I386_BUS_SPACE_MEM;			/* XXX */
+        pa.pa_iot   = X86_BUS_SPACE_IO;				/* XXX */
+        pa.pa_memt  = X86_BUS_SPACE_MEM;			/* XXX */
         pa.pa_dmat  = &pci_bus_dma_tag;				/* XXX */
         for (pa.pa_device=0; pa.pa_device<32; pa.pa_device++)	/* XXX */
           {
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index 0957419..2fbf879 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -372,10 +372,8 @@ sis_read_cmos(struct sis_softc *sc, device_t dev, caddr_t dest, int off, int cnt
 	pci_write_config(bridge, 0x48, reg|0x40, 1);
 
 	/* XXX */
-#if defined(__i386__)
-	btag = I386_BUS_SPACE_IO;
-#elif defined(__amd64__)
-	btag = AMD64_BUS_SPACE_IO;
+#if defined(__amd64__) || defined(__i386__)
+	btag = X86_BUS_SPACE_IO;
 #endif
 
 	for (i = 0; i < cnt; i++) {
diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index 09efc8a..28eae75 100644
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -133,7 +133,7 @@ clkrun_hack(int run)
 			if (pci_get_vendor(*childp) == 0x8086 && pci_get_device(*childp) == 0x7113) {
 				port = (pci_read_config(*childp, 0x41, 1) << 8) + 0x10;
 				/* XXX */
-				btag = I386_BUS_SPACE_IO;
+				btag = X86_BUS_SPACE_IO;
 
 				control = bus_space_read_2(btag, 0x0, port);
 				control &= ~0x2000;
diff --git a/sys/dev/uart/uart_cpu_amd64.c b/sys/dev/uart/uart_cpu_amd64.c
index 3624f79..ce9cf7d 100644
--- a/sys/dev/uart/uart_cpu_amd64.c
+++ b/sys/dev/uart/uart_cpu_amd64.c
@@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-bus_space_tag_t uart_bus_space_io = AMD64_BUS_SPACE_IO;
-bus_space_tag_t uart_bus_space_mem = AMD64_BUS_SPACE_MEM;
+bus_space_tag_t uart_bus_space_io = X86_BUS_SPACE_IO;
+bus_space_tag_t uart_bus_space_mem = X86_BUS_SPACE_MEM;
 
 int
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
diff --git a/sys/dev/uart/uart_cpu_i386.c b/sys/dev/uart/uart_cpu_i386.c
index 0d0f0f7..ce9cf7d 100644
--- a/sys/dev/uart/uart_cpu_i386.c
+++ b/sys/dev/uart/uart_cpu_i386.c
@@ -36,8 +36,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-bus_space_tag_t uart_bus_space_io = I386_BUS_SPACE_IO;
-bus_space_tag_t uart_bus_space_mem = I386_BUS_SPACE_MEM;
+bus_space_tag_t uart_bus_space_io = X86_BUS_SPACE_IO;
+bus_space_tag_t uart_bus_space_mem = X86_BUS_SPACE_MEM;
 
 int
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
diff --git a/sys/dev/uart/uart_cpu_pc98.c b/sys/dev/uart/uart_cpu_pc98.c
index fc50fa5..c211b3d 100644
--- a/sys/dev/uart/uart_cpu_pc98.c
+++ b/sys/dev/uart/uart_cpu_pc98.c
@@ -37,8 +37,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_cpu.h>
 
-bus_space_tag_t uart_bus_space_io = I386_BUS_SPACE_IO;
-bus_space_tag_t uart_bus_space_mem = I386_BUS_SPACE_MEM;
+bus_space_tag_t uart_bus_space_io = X86_BUS_SPACE_IO;
+bus_space_tag_t uart_bus_space_mem = X86_BUS_SPACE_MEM;
 
 static struct {
 	u_long iobase;