aboutsummaryrefslogtreecommitdiffstats
path: root/cvmx.h
diff options
context:
space:
mode:
authorJuli Mallett <jmallett@FreeBSD.org>2012-03-11 04:14:00 +0000
committerJuli Mallett <jmallett@FreeBSD.org>2012-03-11 04:14:00 +0000
commitf8b73ad2e16934621a86fd1fd67b46aa21521d0b (patch)
treecd40bd62c08fa360ceced004ce74decd1b26ca3c /cvmx.h
parent7a1e830cbcd5d33aa7fcdd8732e6ea26510508fd (diff)
downloadsrc-f8b73ad2e16934621a86fd1fd67b46aa21521d0b.tar.gz
src-f8b73ad2e16934621a86fd1fd67b46aa21521d0b.zip
Import Cavium Octeon SDK 2.3.0 Simple Executive from cnusers.org.vendor/octeon-sdk/2.3.0vendor/octeon-sdk
Notes
Notes: svn path=/vendor-sys/octeon-sdk/dist/; revision=232809 svn path=/vendor-sys/octeon-sdk/2.3.0/; revision=232810; tag=vendor/octeon-sdk/2.3.0
Diffstat (limited to 'cvmx.h')
-rw-r--r--cvmx.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/cvmx.h b/cvmx.h
index 9cb0a82a2ac1..0b92bc368d1d 100644
--- a/cvmx.h
+++ b/cvmx.h
@@ -1,5 +1,5 @@
/***********************license start***************
- * Copyright (c) 2003-2010 Cavium Networks (support@cavium.com). All rights
+ * Copyright (c) 2003-2010 Cavium Inc. (support@cavium.com). All rights
* reserved.
*
*
@@ -15,7 +15,7 @@
* disclaimer in the documentation and/or other materials provided
* with the distribution.
- * * Neither the name of Cavium Networks nor the names of
+ * * Neither the name of Cavium Inc. nor the names of
* its contributors may be used to endorse or promote products
* derived from this software without specific prior written
* permission.
@@ -26,7 +26,7 @@
* countries.
* TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED "AS IS"
- * AND WITH ALL FAULTS AND CAVIUM NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR
+ * AND WITH ALL FAULTS AND CAVIUM INC. MAKES NO PROMISES, REPRESENTATIONS OR
* WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, WITH RESPECT TO
* THE SOFTWARE, INCLUDING ITS CONDITION, ITS CONFORMITY TO ANY REPRESENTATION OR
* DESCRIPTION, OR THE EXISTENCE OF ANY LATENT OR PATENT DEFECTS, AND CAVIUM
@@ -45,7 +45,7 @@
* Main Octeon executive header file (This should be the second header
* file included by an application).
*
- * <hr>$Revision: 49448 $<hr>
+ * <hr>$Revision: 70030 $<hr>
*/
#ifndef __CVMX_H__
#define __CVMX_H__
@@ -79,9 +79,9 @@ extern "C" {
#include "cvmx-sysinfo.h"
#include "octeon-model.h"
#include "cvmx-csr.h"
-#include "octeon-feature.h"
#include "cvmx-utils.h"
#include "cvmx-clock.h"
+#include "octeon-feature.h"
#if defined(__mips__) && !defined(CVMX_BUILD_FOR_LINUX_HOST)
#include "cvmx-access-native.h"