From owner-svn-src-all@FreeBSD.ORG  Mon Jan 11 04:38:37 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 E0C96106566B;
	Mon, 11 Jan 2010 04:38:37 +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 CF4AE8FC16;
	Mon, 11 Jan 2010 04:38:37 +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 o0B4cbLF051176;
	Mon, 11 Jan 2010 04:38:37 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0B4cbRE051174;
	Mon, 11 Jan 2010 04:38:37 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001110438.o0B4cbRE051174@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 11 Jan 2010 04:38:37 +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: r202064 - head/sys/mips/mips
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:38:38 -0000

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

Log:
  Cope with the octeon1->cavium move.  Note: none of this junk belongs here.

Modified:
  head/sys/mips/mips/bus_space_generic.c   (contents, props changed)

Modified: head/sys/mips/mips/bus_space_generic.c
==============================================================================
--- head/sys/mips/mips/bus_space_generic.c	Mon Jan 11 04:29:26 2010	(r202063)
+++ head/sys/mips/mips/bus_space_generic.c	Mon Jan 11 04:38:37 2010	(r202064)
@@ -199,7 +199,7 @@ static struct bus_space generic_space = 
 /* Ultra-gross kludge */
 #include "opt_cputype.h"
 #if defined(TARGET_OCTEON) && defined(ISA_MIPS32)
-#include <mips/octeon1/octeon_pcmap_regs.h>
+#include <mips/cavium/octeon_pcmap_regs.h>
 #define rd8(a) oct_read8(a)
 #define rd16(a) oct_read16(a)
 #define rd32(a) oct_read32(a)