From 0da1cf40944b24633a769f789e072b7de60c2fd7 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 24 Jan 2014 16:50:15 +0000 Subject: [PATCH] Remove redundant declaration for uart devclass. Commint some unrelated, but harmless, FDT ifdefs. --- sys/arm/at91/uart_bus_at91usart.c | 2 -- sys/arm/at91/uart_cpu_at91usart.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/at91/uart_bus_at91usart.c b/sys/arm/at91/uart_bus_at91usart.c index 98cde1d0231a..65829df0b565 100644 --- a/sys/arm/at91/uart_bus_at91usart.c +++ b/sys/arm/at91/uart_bus_at91usart.c @@ -48,8 +48,6 @@ __FBSDID("$FreeBSD$"); static int usart_at91_probe(device_t dev); -extern struct uart_class at91_usart_class; - static device_method_t usart_at91_methods[] = { /* Device interface */ DEVMETHOD(device_probe, usart_at91_probe), diff --git a/sys/arm/at91/uart_cpu_at91usart.c b/sys/arm/at91/uart_cpu_at91usart.c index 33b562195798..67a0a05c1979 100644 --- a/sys/arm/at91/uart_cpu_at91usart.c +++ b/sys/arm/at91/uart_cpu_at91usart.c @@ -26,8 +26,10 @@ * SUCH DAMAGE. */ +#include "opt_platform.h" #include "opt_uart.h" +#ifndef FDT #include __FBSDID("$FreeBSD$"); @@ -48,7 +50,6 @@ __FBSDID("$FreeBSD$"); bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; -extern struct uart_class at91_usart_class; extern struct bus_space at91_bs_tag; int @@ -86,3 +87,4 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) uart_getenv(devtype, di, class); return (0); } +#endif