diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-12-24 11:12:35 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2023-12-24 11:12:35 +0000 |
| commit | 6134b6a8fcb1b5f1bb699f95e4caa9b1653d6a6b (patch) | |
| tree | 75247badfdc6a20cf95db95b41a91c79caa0be07 /sys/arch | |
| parent | 16d7afbcc9fec3b5d05321cc128d15ed4fb98ecb (diff) | |
rename bus_type enum to sparc_bus_type to not conflict with bus_type in drm
build error reported by deraadt@ ok kettenis@
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/include/bus.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h index ec4f81462be..2fe24473fa7 100644 --- a/sys/arch/sparc64/include/bus.h +++ b/sys/arch/sparc64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.36 2022/10/16 01:22:39 jsg Exp $ */ +/* $OpenBSD: bus.h,v 1.37 2023/12/24 11:12:34 jsg Exp $ */ /* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */ /*- @@ -126,7 +126,7 @@ extern int bus_space_debug; * PCI spaces are non-cached and little endian */ -enum bus_type { +enum sparc_bus_type { UPA_BUS_SPACE, SBUS_BUS_SPACE, PCI_CONFIG_BUS_SPACE, @@ -166,7 +166,7 @@ typedef struct _bus_space_handle { struct sparc_bus_space_tag { void *cookie; bus_space_tag_t parent; - enum bus_type default_type; + enum sparc_bus_type default_type; u_int8_t asi; u_int8_t sasi; char name[32]; |