From owner-svn-src-head@FreeBSD.ORG  Fri Jan 24 16:50:16 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7853F824;
 Fri, 24 Jan 2014 16:50:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 654291227;
 Fri, 24 Jan 2014 16:50:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0OGoG8m026189;
 Fri, 24 Jan 2014 16:50:16 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0OGoGPp026187;
 Fri, 24 Jan 2014 16:50:16 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201401241650.s0OGoGPp026187@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 24 Jan 2014 16:50:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261126 - head/sys/arm/at91
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Jan 2014 16:50:16 -0000

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