From owner-svn-src-all@FreeBSD.ORG  Sun Jun 14 02:58:56 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 636161065673;
	Sun, 14 Jun 2009 02:58:56 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5233B8FC13;
	Sun, 14 Jun 2009 02:58:56 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5E2wuZj032543;
	Sun, 14 Jun 2009 02:58:56 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5E2wu8o032542;
	Sun, 14 Jun 2009 02:58:56 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200906140258.n5E2wu8o032542@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 14 Jun 2009 02:58:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194142 - head/sys/mips/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 02:58:56 -0000

Author: imp
Date: Sun Jun 14 02:58:56 2009
New Revision: 194142
URL: http://svn.freebsd.org/changeset/base/194142

Log:
  After Marcel's change to DEFAULTS, we were bringing in a bogus copy of
  uart_8250.  Remove it here since the UART on the ADM5120 isn't the
  typical 16550: its completely different.

Modified:
  head/sys/mips/conf/ADM5120

Modified: head/sys/mips/conf/ADM5120
==============================================================================
--- head/sys/mips/conf/ADM5120	Sun Jun 14 02:55:07 2009	(r194141)
+++ head/sys/mips/conf/ADM5120	Sun Jun 14 02:58:56 2009	(r194142)
@@ -54,7 +54,6 @@ options 	BOOTP_COMPAT
 #options 	UFS_DIRHASH		#Improve performance on big directories
 options 	ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"
 
-
 # Debugging for use in -current
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
@@ -64,4 +63,5 @@ options 	INVARIANT_SUPPORT	#Extra sanity
 device		loop
 device		ether
 device		uart
+nodevice	uart_8250		# No 8250 here
 # device		md