From owner-svn-src-user@FreeBSD.ORG  Thu Apr 22 00:12:04 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64E081065672;
	Thu, 22 Apr 2010 00:12:04 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4AFA18FC0A;
	Thu, 22 Apr 2010 00:12:04 +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 o3M0C4cH010255;
	Thu, 22 Apr 2010 00:12:04 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3M0C4tX010249;
	Thu, 22 Apr 2010 00:12:04 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004220012.o3M0C4tX010249@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 22 Apr 2010 00:12:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207029 - user/jmallett/octeon/sys/contrib/octeon-sdk
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Apr 2010 00:12:04 -0000

Author: jmallett
Date: Thu Apr 22 00:12:03 2010
New Revision: 207029
URL: http://svn.freebsd.org/changeset/base/207029

Log:
  Fix build of these files with the current configuration scheme.

Modified:
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.c
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-fpa.c
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-pko.c
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-spi.c

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.c
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.c	Wed Apr 21 23:47:04 2010	(r207028)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-cmd-queue.c	Thu Apr 22 00:12:03 2010	(r207029)
@@ -49,7 +49,6 @@
  *
  * <hr>$Revision: 42150 $<hr>
  */
-#include "cvmx-config.h"
 #include "cvmx.h"
 #include "cvmx-fpa.h"
 #include "cvmx-cmd-queue.h"

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-fpa.c
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-fpa.c	Wed Apr 21 23:47:04 2010	(r207028)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-fpa.c	Thu Apr 22 00:12:03 2010	(r207029)
@@ -50,7 +50,6 @@
  *
  */
 
-#include "cvmx-config.h"
 #include "cvmx.h"
 #include "cvmx-fpa.h"
 #include "cvmx-ipd.h"

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c	Wed Apr 21 23:47:04 2010	(r207028)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-helper-loop.c	Thu Apr 22 00:12:03 2010	(r207029)
@@ -49,12 +49,11 @@
  *
  * <hr>$Revision: 41586 $<hr>
  */
-#ifdef CVMX_ENABLE_PKO_FUNCTIONS
-
 #include "cvmx.h"
 #include "cvmx-helper.h"
 
 
+#ifdef CVMX_ENABLE_PKO_FUNCTIONS
 /**
  * @INTERNAL
  * Probe a LOOP interface and determine the number of ports

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-pko.c
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-pko.c	Wed Apr 21 23:47:04 2010	(r207028)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-pko.c	Thu Apr 22 00:12:03 2010	(r207029)
@@ -48,8 +48,6 @@
  *
  * <hr>$Revision: 42150 $<hr>
  */
-#include "executive-config.h"
-#include "cvmx-config.h"
 #include "cvmx.h"
 #include "cvmx-pko.h"
 #include "cvmx-sysinfo.h"

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-spi.c
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-spi.c	Wed Apr 21 23:47:04 2010	(r207028)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-spi.c	Thu Apr 22 00:12:03 2010	(r207029)
@@ -48,7 +48,6 @@
  *
  * <hr>$Revision: 41586 $<hr>
  */
-#include "cvmx-config.h"
 #include "cvmx.h"
 #include "cvmx-mio.h"
 #include "cvmx-pko.h"