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/atkbdc/atkbdc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sys/dev/atkbdc/atkbdc.c') 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__) -- cgit v1.1