Deleted Added
full compact
cvmx-clock.c (215976) cvmx-clock.c (215990)
1/***********************license start***************
2 * Copyright (c) 2003-2010 Cavium Networks (support@cavium.com). All rights
3 * reserved.
4 *
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are
8 * met:

--- 45 unchanged lines hidden (view full) ---

54#ifdef CVMX_BUILD_FOR_LINUX_KERNEL
55#include <linux/module.h>
56#include <asm/octeon/octeon.h>
57#include <asm/octeon/cvmx-clock.h>
58#include <asm/octeon/cvmx-npei-defs.h>
59#include <asm/octeon/cvmx-pexp-defs.h>
60#include <asm/octeon/cvmx-dbg-defs.h>
61#else
1/***********************license start***************
2 * Copyright (c) 2003-2010 Cavium Networks (support@cavium.com). All rights
3 * reserved.
4 *
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are
8 * met:

--- 45 unchanged lines hidden (view full) ---

54#ifdef CVMX_BUILD_FOR_LINUX_KERNEL
55#include <linux/module.h>
56#include <asm/octeon/octeon.h>
57#include <asm/octeon/cvmx-clock.h>
58#include <asm/octeon/cvmx-npei-defs.h>
59#include <asm/octeon/cvmx-pexp-defs.h>
60#include <asm/octeon/cvmx-dbg-defs.h>
61#else
62#if !defined(__FreeBSD__) || !defined(_KERNEL)
62#include "executive-config.h"
63#include "executive-config.h"
64#endif
63#include "cvmx.h"
64#endif
65
66#ifndef CVMX_BUILD_FOR_UBOOT
67static uint64_t rate_eclk = 0;
68static uint64_t rate_sclk = 0;
69static uint64_t rate_dclk = 0;
70#endif

--- 67 unchanged lines hidden ---
65#include "cvmx.h"
66#endif
67
68#ifndef CVMX_BUILD_FOR_UBOOT
69static uint64_t rate_eclk = 0;
70static uint64_t rate_sclk = 0;
71static uint64_t rate_dclk = 0;
72#endif

--- 67 unchanged lines hidden ---