svn commit: r207029 - user/jmallett/octeon/sys/contrib/octeon-sdk

[Juli Mallett]

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"