From 31ea24b5b07812a00a15514460b4134f23c0ba02 Mon Sep 17 00:00:00 2001 From: Oskar Schirmer Date: Mon, 11 May 2009 15:43:35 +0200 Subject: [PATCH] --- yaml --- r: 144921 b: refs/heads/master c: d15f05eb8cc4ad59699c16b8ae834b85c6d39bfe h: refs/heads/master i: 144919: 3ad5319327eb1f076de17c9ad03f6fd58e987e2a v: v3 --- [refs] | 2 +- trunk/arch/xtensa/include/asm/timex.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4107493e1eb8..6a73a93f5633 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fb137c1e33cd188b40b3c0d7283412efeeb783f +refs/heads/master: d15f05eb8cc4ad59699c16b8ae834b85c6d39bfe diff --git a/trunk/arch/xtensa/include/asm/timex.h b/trunk/arch/xtensa/include/asm/timex.h index b83a8181d448..053bc4272106 100644 --- a/trunk/arch/xtensa/include/asm/timex.h +++ b/trunk/arch/xtensa/include/asm/timex.h @@ -39,9 +39,9 @@ #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT extern unsigned long ccount_per_jiffy; -extern unsigned long ccount_nsec; +extern unsigned long nsec_per_ccount; #define CCOUNT_PER_JIFFY ccount_per_jiffy -#define NSEC_PER_CCOUNT ccount_nsec +#define NSEC_PER_CCOUNT nsec_per_ccount #else #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ)) #define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK)