summaryrefslogtreecommitdiffstats
path: root/sys/pc98/include
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2010-10-31 03:03:20 +0000
committernyan <nyan@FreeBSD.org>2010-10-31 03:03:20 +0000
commit8d191fa3637a9e5f1ebd79ce00369cab44896f79 (patch)
tree7b8ba00728c98ad19214fdf83f3f0c072212366c /sys/pc98/include
parent46e60c57ece3af2116459edfe00451a09ff94261 (diff)
downloadFreeBSD-src-8d191fa3637a9e5f1ebd79ce00369cab44896f79.zip
FreeBSD-src-8d191fa3637a9e5f1ebd79ce00369cab44896f79.tar.gz
Rename BUS_SPACE_IO and BUS_SPACE_MEM defines to BUS_SPACE_TAG_IO and
BUS_SPACE_TAG_MEM respectively to avoid conflict with nexus.c.
Diffstat (limited to 'sys/pc98/include')
-rw-r--r--sys/pc98/include/bus.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pc98/include/bus.h b/sys/pc98/include/bus.h
index 07b7ea3..b12845c 100644
--- a/sys/pc98/include/bus.h
+++ b/sys/pc98/include/bus.h
@@ -158,8 +158,8 @@ struct bus_space_access_methods {
* Access methods for bus resources and address space.
*/
struct bus_space_tag {
-#define BUS_SPACE_IO 0
-#define BUS_SPACE_MEM 1
+#define BUS_SPACE_TAG_IO 0
+#define BUS_SPACE_TAG_MEM 1
u_int bs_tag; /* bus space flags */
struct bus_space_access_methods bs_da; /* direct access */
OpenPOWER on IntegriCloud