From owner-svn-src-all@FreeBSD.ORG  Mon Jan 11 04:40:38 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 5B172106568B;
	Mon, 11 Jan 2010 04:40:38 +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 4A1018FC14;
	Mon, 11 Jan 2010 04:40:38 +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 o0B4ecjc051767;
	Mon, 11 Jan 2010 04:40:38 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0B4ecAV051764;
	Mon, 11 Jan 2010 04:40:38 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001110440.o0B4ecAV051764@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 11 Jan 2010 04:40:38 +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: r202065 - 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: Mon, 11 Jan 2010 04:40:38 -0000

Author: imp
Date: Mon Jan 11 04:40:38 2010
New Revision: 202065
URL: http://svn.freebsd.org/changeset/base/202065

Log:
  Cope with the octeon1->cavium move.

Modified:
  head/sys/mips/conf/OCTEON1   (contents, props changed)
  head/sys/mips/conf/OCTEON1-32   (contents, props changed)
Directory Properties:
  head/sys/mips/conf/OCTEON1.hints   (props changed)

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Mon Jan 11 04:38:37 2010	(r202064)
+++ head/sys/mips/conf/OCTEON1	Mon Jan 11 04:40:38 2010	(r202065)
@@ -31,7 +31,7 @@ makeoptions     TARGET_64BIT=defined
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
 options		KERNVIRTADDR=0xffffffff80100000
-include		"../octeon1/std.octeon1"
+include		"../cavium/std.octeon1"
 
 hints		"OCTEON1.hints"		#Default places to look for devices.
 

Modified: head/sys/mips/conf/OCTEON1-32
==============================================================================
--- head/sys/mips/conf/OCTEON1-32	Mon Jan 11 04:38:37 2010	(r202064)
+++ head/sys/mips/conf/OCTEON1-32	Mon Jan 11 04:40:38 2010	(r202065)
@@ -32,7 +32,7 @@ makeoptions     LDSCRIPT_NAME=ldscript.m
 
 options		KERNVIRTADDR=0x80100000
 makeoptions	KERNLOADADDR=0x80100000
-include		"../octeon1/std.octeon1"
+include		"../cavium/std.octeon1"
 
 hints		"OCTEON1.hints"		#Default places to look for devices.