diff options
author | tijl <tijl@FreeBSD.org> | 2010-12-20 16:39:43 +0000 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2010-12-20 16:39:43 +0000 |
commit | 0f810ef0a25b4d64ffe05b47b5dfd30d73167b71 (patch) | |
tree | 1dae55b03b0d7f2f5c78986fe19e42d381f09774 /sys/dev/atkbdc | |
parent | 17886985855b2679e5479ecc5effa42d979bd3ac (diff) | |
download | FreeBSD-src-0f810ef0a25b4d64ffe05b47b5dfd30d73167b71.zip FreeBSD-src-0f810ef0a25b4d64ffe05b47b5dfd30d73167b71.tar.gz |
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)
Diffstat (limited to 'sys/dev/atkbdc')
-rw-r--r-- | sys/dev/atkbdc/atkbdc.c | 6 |
1 files changed, 2 insertions, 4 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__) |