summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-01-24 16:50:15 +0000
committerimp <imp@FreeBSD.org>2014-01-24 16:50:15 +0000
commite97be4e538f370f28824f2245f29cab87a60bc7c (patch)
tree7278a60674cfc4ec65aa669d008cca2e447dc84f
parent5b4046f60ff315a314f4701a931290673b290ab0 (diff)
downloadFreeBSD-src-e97be4e538f370f28824f2245f29cab87a60bc7c.zip
FreeBSD-src-e97be4e538f370f28824f2245f29cab87a60bc7c.tar.gz
Remove redundant declaration for uart devclass.
Commint some unrelated, but harmless, FDT ifdefs.
-rw-r--r--sys/arm/at91/uart_bus_at91usart.c2
-rw-r--r--sys/arm/at91/uart_cpu_at91usart.c4
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 98cde1d..65829df 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 33b5621..67a0a05 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 <sys/cdefs.h>
__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
OpenPOWER on IntegriCloud