From owner-p4-projects@FreeBSD.ORG  Thu Feb 21 15:26:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B687016A411; Thu, 21 Feb 2008 15:26:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63C0A16A401
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 15:26:32 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5362213C469
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 15:26:32 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1LFQWXU041462
	for <perforce@freebsd.org>; Thu, 21 Feb 2008 15:26:32 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1LFQWgu041459
	for perforce@freebsd.org; Thu, 21 Feb 2008 15:26:32 GMT
	(envelope-from rrs@cisco.com)
Date: Thu, 21 Feb 2008 15:26:32 GMT
Message-Id: <200802211526.m1LFQWgu041459@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135893 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Feb 2008 15:26:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=135893

Change 135893 by rrs@rrs-mips2-jnpr on 2008/02/21 15:25:40

	fixes.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_ebt3000_cf.c#4 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/octeon_ebt3000_cf.c#4 (text+ko) ====

@@ -70,8 +70,14 @@
 #include <machine/md_var.h>
 #include <machine/cpuregs.h>
 
-#include "octeon_ebt3000_cf.h"
-#include "driveid.h"
+#include <mips/mips32/octeon32/octeon_ebt3000_cf.h>
+#include <mips/mips32/octeon32/driveid.h>
+/* Octeon specific includes with loads of in-lines */
+#include <mips/mips32/octeon32/octeon_pcmap_regs.h>
+#include <mips/mips32/octeon32/bus_octeon.h>
+
+
+
 
 /* ATA Commands */
 #define CMD_READ_SECTOR		0x20
@@ -572,7 +578,7 @@
 
 
 	if (!octeon_board_real())
-		return 1;
+		return;
 
 	base_addr = (void *)OCTEON_PHYS2PTR(OCTEON_CF_COMMON_BASE_ADDR);