From owner-svn-src-all@FreeBSD.ORG  Tue Nov 27 02:03:42 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 5B2B55DF;
 Tue, 27 Nov 2012 02:03:42 +0000 (UTC)
 (envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4005E8FC1F;
 Tue, 27 Nov 2012 02:03:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAR23gU7042072;
 Tue, 27 Nov 2012 02:03:42 GMT
 (envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAR23gBR042071;
 Tue, 27 Nov 2012 02:03:42 GMT
 (envelope-from jmallett@svn.freebsd.org)
Message-Id: <201211270203.qAR23gBR042071@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 27 Nov 2012 02:03:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r243587 - head/sys/contrib/octeon-sdk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Tue, 27 Nov 2012 02:03:42 -0000

Author: jmallett
Date: Tue Nov 27 02:03:41 2012
New Revision: 243587
URL: http://svnweb.freebsd.org/changeset/base/243587

Log:
  Allow this file to build on FreeBSD.

Modified:
  head/sys/contrib/octeon-sdk/cvmx-dma-engine.c

Modified: head/sys/contrib/octeon-sdk/cvmx-dma-engine.c
==============================================================================
--- head/sys/contrib/octeon-sdk/cvmx-dma-engine.c	Tue Nov 27 01:59:51 2012	(r243586)
+++ head/sys/contrib/octeon-sdk/cvmx-dma-engine.c	Tue Nov 27 02:03:41 2012	(r243587)
@@ -65,8 +65,10 @@
 #include <asm/octeon/cvmx-pexp-defs.h>
 #include <asm/octeon/cvmx-helper-cfg.h>
 #else
+#if !defined(__FreeBSD__) || !defined(_KERNEL)
 #include "executive-config.h"
 #include "cvmx-config.h"
+#endif
 #include "cvmx.h"
 #include "cvmx-cmd-queue.h"
 #include "cvmx-dma-engine.h"