From f8b73ad2e16934621a86fd1fd67b46aa21521d0b Mon Sep 17 00:00:00 2001 From: Juli Mallett Date: Sun, 11 Mar 2012 04:14:00 +0000 Subject: Import Cavium Octeon SDK 2.3.0 Simple Executive from cnusers.org. --- cvmx.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cvmx.h') 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). * - *
$Revision: 49448 $
+ *
$Revision: 70030 $
*/ #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" -- cgit v1.2.3