From 78000f6960a3b3bd50ac7ce7d2514e9a5f07a237 Mon Sep 17 00:00:00 2001 From: andrew Date: Thu, 26 Jan 2017 13:04:14 +0000 Subject: [PATCH] Make fdt_pm_mask_table internal to the Marvell code, it's unued anywhere else. Sponsored by: ABT Systems Ltd --- sys/arm/mv/mv_common.c | 7 ++++++- sys/dev/fdt/fdt_common.h | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/arm/mv/mv_common.c b/sys/arm/mv/mv_common.c index aea1eaceb836..1e1ab2598ab0 100644 --- a/sys/arm/mv/mv_common.c +++ b/sys/arm/mv/mv_common.c @@ -149,7 +149,12 @@ static struct soc_node_spec soc_nodes[] = { { NULL, NULL, NULL }, }; -struct fdt_pm_mask_entry fdt_pm_mask_table[] = { +struct fdt_pm_mask_entry { + char *compat; + uint32_t mask; +}; + +static struct fdt_pm_mask_entry fdt_pm_mask_table[] = { { "mrvl,ge", CPU_PM_CTRL_GE(0) }, { "mrvl,ge", CPU_PM_CTRL_GE(1) }, { "mrvl,usb-ehci", CPU_PM_CTRL_USB(0) }, diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index 81ce4bfae2ea..904d3e18fab1 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -71,12 +71,6 @@ extern vm_paddr_t fdt_immr_pa; extern vm_offset_t fdt_immr_va; extern vm_offset_t fdt_immr_size; -struct fdt_pm_mask_entry { - char *compat; - uint32_t mask; -}; -extern struct fdt_pm_mask_entry fdt_pm_mask_table[]; - #if defined(FDT_DTB_STATIC) extern u_char fdt_static_dtb; #endif