From owner-svn-src-projects@FreeBSD.ORG  Sun Jun 14 06:10:37 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5FB99106566B;
	Sun, 14 Jun 2009 06:10: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 4F6398FC12;
	Sun, 14 Jun 2009 06:10:37 +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 n5E6Abhv037213;
	Sun, 14 Jun 2009 06:10:37 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5E6Abep037212;
	Sun, 14 Jun 2009 06:10:37 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200906140610.n5E6Abep037212@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 14 Jun 2009 06:10:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194160 - projects/mips/sys/mips/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 06:10:37 -0000

Author: imp
Date: Sun Jun 14 06:10:36 2009
New Revision: 194160
URL: http://svn.freebsd.org/changeset/base/194160

Log:
  Cavium-specific goo is no longer necessary here.  Of course, I now
  have to write a bus space for cavium, but that shouldn't be too hard.

Modified:
  projects/mips/sys/mips/include/_bus.h

Modified: projects/mips/sys/mips/include/_bus.h
==============================================================================
--- projects/mips/sys/mips/include/_bus.h	Sun Jun 14 06:09:33 2009	(r194159)
+++ projects/mips/sys/mips/include/_bus.h	Sun Jun 14 06:10:36 2009	(r194160)
@@ -31,9 +31,6 @@
 
 #ifndef MIPS_INCLUDE__BUS_H
 #define	MIPS_INCLUDE__BUS_H
-#ifdef TARGET_OCTEON
-#include "_bus_octeon.h"
-#else
 /*
  * Bus address and size types
  */
@@ -45,5 +42,4 @@ typedef uintptr_t bus_size_t;
  */
 typedef struct bus_space *bus_space_tag_t;
 typedef u_long bus_space_handle_t;
-#endif
 #endif /* MIPS_INCLUDE__BUS_H */