From b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32 Mon Sep 17 00:00:00 2001
From: ian <ian@FreeBSD.org>
Date: Wed, 1 Mar 2017 19:55:04 +0000
Subject: 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.
---
 sys/arm/mv/mv_machdep.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sys/arm/mv')

diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c
index b11c3b5..782fcf0 100644
--- a/sys/arm/mv/mv_machdep.c
+++ b/sys/arm/mv/mv_machdep.c
@@ -428,6 +428,7 @@ platform_devmap_init(void)
 	return (0);
 }
 
+#if __ARM_ARCH < 6
 struct arm32_dma_range *
 bus_dma_get_range(void)
 {
@@ -441,6 +442,7 @@ bus_dma_get_range_nb(void)
 
 	return (0);
 }
+#endif
 
 #if defined(CPU_MV_PJ4B)
 #ifdef DDB
-- 
cgit v1.1