From owner-svn-src-all@FreeBSD.ORG  Sat Jan  9 18:14:27 2010
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 82C5E106568F;
	Sat,  9 Jan 2010 18:14:27 +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 7258A8FC1D;
	Sat,  9 Jan 2010 18:14:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o09IERHd077055;
	Sat, 9 Jan 2010 18:14:27 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o09IEROb077054;
	Sat, 9 Jan 2010 18:14:27 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001091814.o09IEROb077054@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 9 Jan 2010 18:14:27 +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: r201913 - 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: Sat, 09 Jan 2010 18:14:27 -0000

Author: imp
Date: Sat Jan  9 18:14:27 2010
New Revision: 201913
URL: http://svn.freebsd.org/changeset/base/201913

Log:
  Merge from projects/mips to head by hand:
  
  Copy over OCTEON1.hints file.

Added:
     - copied unchanged from r201912, projects/mips/sys/mips/conf/OCTEON1.hints
Directory Properties:
  head/sys/mips/conf/OCTEON1.hints   (props changed)

Copied: head/sys/mips/conf/OCTEON1.hints (from r201912, projects/mips/sys/mips/conf/OCTEON1.hints)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/mips/conf/OCTEON1.hints	Sat Jan  9 18:14:27 2010	(r201913, copy of r201912, projects/mips/sys/mips/conf/OCTEON1.hints)
@@ -0,0 +1,13 @@
+# /*
+#  *    This product includes software developed by the University of
+
+#  *    California, Berkeley and its contributors."
+# */
+# device.hints
+hw.uart.console="io:0x1"
+hint.obio.0.at="nexus"
+hint.obio.0.maddr="0x1"
+hint.obio.0.flags="0x1"
+hint.uart.0.at="obio"
+hint.uart.0.maddr="0x1"
+hint.uart.0.flags="0x1"