From b6db1fb93d0aefdf2d82e9b20ca36094d5a3cb32 Mon Sep 17 00:00:00 2001 From: ian 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/lpc/lpc_gpio.c | 2 +- sys/arm/lpc/lpc_intc.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'sys/arm/lpc') diff --git a/sys/arm/lpc/lpc_gpio.c b/sys/arm/lpc/lpc_gpio.c index 798469d..b062792 100644 --- a/sys/arm/lpc/lpc_gpio.c +++ b/sys/arm/lpc/lpc_gpio.c @@ -518,7 +518,7 @@ lpc_gpio_get_state(device_t dev, int pin, int *state) } void -lpc_gpio_init() +lpc_gpio_init(void) { bus_space_tag_t bst; bus_space_handle_t bsh; diff --git a/sys/arm/lpc/lpc_intc.c b/sys/arm/lpc/lpc_intc.c index db7c300..d26ef90 100644 --- a/sys/arm/lpc/lpc_intc.c +++ b/sys/arm/lpc/lpc_intc.c @@ -227,10 +227,6 @@ lpc_intc_eoi(void *data) } -struct fdt_fixup_entry fdt_fixup_table[] = { - { NULL, NULL } -}; - #ifndef INTRNG static int fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig, -- cgit v1.1