diff options
| author | ian <ian@FreeBSD.org> | 2017-03-01 19:55:04 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2017-03-01 19:55:04 +0000 |
| commit | b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32 (patch) | |
| tree | 74ac95ca667cdb4a171c9b715afd910264fb413d /sys/arm/include | |
| parent | fc497a4640d662955a6d75b5e5ca52703fbb525a (diff) | |
| download | FreeBSD-src-b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32.zip FreeBSD-src-b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32.tar.gz | |
MFC r306262, r306267, r310021: (needed to avoid conflicts on later merges)
Remove bus_dma_get_range and bus_dma_get_range_nb on armv6. We only need
this on a few earlier arm SoCs.
Restrict where we need to define fdt_fixup_table to just PowerPC and
Marvell.
Add the missing void to function signatures in much of the arm code.
Diffstat (limited to 'sys/arm/include')
| -rw-r--r-- | sys/arm/include/bus_dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h index ddf5504..1295118 100644 --- a/sys/arm/include/bus_dma.h +++ b/sys/arm/include/bus_dma.h @@ -72,7 +72,7 @@ #define BUS_DMA_TAG_VALID(t) ((t) != (bus_dma_tag_t)0) -#ifdef _ARM32_BUS_DMA_PRIVATE +#if defined(_ARM32_BUS_DMA_PRIVATE) && __ARM_ARCH < 6 /* * arm32_dma_range * |
