From 0f810ef0a25b4d64ffe05b47b5dfd30d73167b71 Mon Sep 17 00:00:00 2001 From: tijl Date: Mon, 20 Dec 2010 16:39:43 +0000 Subject: Merge amd64 and i386 bus.h and move the resulting header to x86. Replace the original amd64 and i386 headers with stubs. Rename (AMD64|I386)_BUS_SPACE_* to X86_BUS_SPACE_* everywhere. Reviewed by: imp (previous version), jhb Approved by: kib (mentor) --- sys/dev/sis/if_sis.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sys/dev/sis') 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++) { -- cgit v1.1