From eed4923e178ed7783b0dac916688e40dce6372cb Mon Sep 17 00:00:00 2001 From: Owain Ainsworth Date: Wed, 3 Dec 2008 15:46:08 +0000 Subject: 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@ --- sys/arch/amd64/pci/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/arch/amd64/pci/iommu.c') diff --git a/sys/arch/amd64/pci/iommu.c b/sys/arch/amd64/pci/iommu.c index 6858d4203be..1fc6f1828a5 100644 --- a/sys/arch/amd64/pci/iommu.c +++ b/sys/arch/amd64/pci/iommu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iommu.c,v 1.22 2008/04/28 06:17:47 brad Exp $ */ +/* $OpenBSD: iommu.c,v 1.23 2008/12/03 15:46:06 oga Exp $ */ /* * Copyright (c) 2005 Jason L. Wright (jason@thought.net) @@ -38,7 +38,7 @@ #include -#define _X86_BUS_DMA_PRIVATE +#define _BUS_DMA_PRIVATE #include #include @@ -151,7 +151,7 @@ void amdgart_dmamem_unmap(bus_dma_tag_t, caddr_t, size_t); paddr_t amdgart_dmamem_mmap(bus_dma_tag_t, bus_dma_segment_t *, int, off_t, int, int); -struct x86_bus_dma_tag amdgart_bus_dma_tag = { +struct bus_dma_tag amdgart_bus_dma_tag = { NULL, /* _may_bounce */ amdgart_dmamap_create, amdgart_dmamap_destroy, -- cgit v1.2.3