diff options
Diffstat (limited to 'cvmx-log.h')
| -rw-r--r-- | cvmx-log.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/cvmx-log.h b/cvmx-log.h index 87fb61c2f6947..b8894e880f7e6 100644 --- a/cvmx-log.h +++ b/cvmx-log.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 @@ -52,9 +52,15 @@ * log data to a differnet buffer to avoid synchronization overhead. Function * call logging can be turned on with the GCC option "-pg". * - * <hr>$Revision: 49448 $<hr> + * <hr>$Revision: 70030 $<hr> */ +#ifdef CVMX_BUILD_FOR_LINUX_KERNEL +#include <asm/octeon/cvmx-core.h> +#else +#include "cvmx-core.h" +#endif + #ifdef __cplusplus extern "C" { #endif |