svn commit: r261126 - head/sys/arm/at91

[Warner Losh]

Author: imp
Date: Fri Jan 24 16:50:15 2014
New Revision: 261126
URL: http://svnweb.freebsd.org/changeset/base/261126

Log:
  Remove redundant declaration for uart devclass.
  Commint some unrelated, but harmless, FDT ifdefs.

Modified:
  head/sys/arm/at91/uart_bus_at91usart.c
  head/sys/arm/at91/uart_cpu_at91usart.c

Modified: head/sys/arm/at91/uart_bus_at91usart.c
==============================================================================
--- head/sys/arm/at91/uart_bus_at91usart.c	Fri Jan 24 16:40:51 2014	(r261125)
+++ head/sys/arm/at91/uart_bus_at91usart.c	Fri Jan 24 16:50:15 2014	(r261126)
@@ -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),

Modified: head/sys/arm/at91/uart_cpu_at91usart.c
==============================================================================
--- head/sys/arm/at91/uart_cpu_at91usart.c	Fri Jan 24 16:40:51 2014	(r261125)
+++ head/sys/arm/at91/uart_cpu_at91usart.c	Fri Jan 24 16:50:15 2014	(r261126)
@@ -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
 	uart_getenv(devtype, di, class);
 	return (0);
 }
+#endif