diff options
| author | Oskar Schirmer <os@emlix.com> | 2009-05-11 15:43:35 +0200 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-05-11 22:00:11 -0700 |
| commit | d15f05eb8cc4ad59699c16b8ae834b85c6d39bfe (patch) | |
| tree | c6f4bc44b99118afae06bde6dfff8d2ece3bda63 /arch/xtensa | |
| parent | 1fb137c1e33cd188b40b3c0d7283412efeeb783f (diff) | |
| download | lwn-d15f05eb8cc4ad59699c16b8ae834b85c6d39bfe.tar.gz lwn-d15f05eb8cc4ad59699c16b8ae834b85c6d39bfe.zip | |
xtensa: fix wrong extern declaration renamed in code using it
The variable ccount_nsec has been renamed to nsec_per_ccount
in arch/xtensa/kernel/time.c in 2b8aea74 (2007-08-05),
but the fix failed to rename the variable in
arch/xtensa/include/asm/timex.h as well.
Signed-off-by: Oskar Schirmer <os@emlix.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa')
| -rw-r--r-- | arch/xtensa/include/asm/timex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/xtensa/include/asm/timex.h b/arch/xtensa/include/asm/timex.h index b83a8181d448..053bc4272106 100644 --- a/arch/xtensa/include/asm/timex.h +++ b/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) |