diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-12-03 15:46:08 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-12-03 15:46:08 +0000 |
| commit | eed4923e178ed7783b0dac916688e40dce6372cb (patch) | |
| tree | 7763d5d2b02b9bbb4e82cd54fdc2d9052c4d6cfc /sys/arch/amd64/isa | |
| parent | e5cb898edd1b10cebb2a4a4531325af2b64c6114 (diff) | |
Remove the x86 and i386 prefixes to the bus_dma types. It's really quite
pointless and just makes the code different for no reason. This moves i386 and
amd64 bus_dma to being a lot closer to identical.
suggestion to just remove the prefix instead of merge them from deraadt@.
no objections art@, kettenis@, ok weingart@
Diffstat (limited to 'sys/arch/amd64/isa')
| -rw-r--r-- | sys/arch/amd64/isa/isa_machdep.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/amd64/isa/isa_machdep.c b/sys/arch/amd64/isa/isa_machdep.c index 85c54d88ee9..60f70e1c934 100644 --- a/sys/arch/amd64/isa/isa_machdep.c +++ b/sys/arch/amd64/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.14 2008/06/26 05:42:09 ray Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.15 2008/12/03 15:46:06 oga Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -85,7 +85,7 @@ #include <machine/mpbiosvar.h> #endif -#define _X86_BUS_DMA_PRIVATE +#define _BUS_DMA_PRIVATE #include <machine/bus.h> #include <machine/intr.h> @@ -148,7 +148,7 @@ void _isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t); * the generic functions that understand how to deal with bounce * buffers, if necessary. */ -struct x86_bus_dma_tag isa_bus_dma_tag = { +struct bus_dma_tag isa_bus_dma_tag = { NULL, /* _cookie */ _isa_bus_dmamap_create, _isa_bus_dmamap_destroy, |