diff options
| author | Oskar Schirmer <os@emlix.com> | 2009-05-11 09:43:35 -0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2009-05-12 01:00:11 -0400 |
| commit | d15f05eb8cc4ad59699c16b8ae834b85c6d39bfe (patch) | |
| tree | c6f4bc44b99118afae06bde6dfff8d2ece3bda63 /arch/xtensa | |
| parent | 1fb137c1e33cd188b40b3c0d7283412efeeb783f (diff) | |
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 b83a8181d44..053bc427210 100644 --- a/arch/xtensa/include/asm/timex.h +++ b/arch/xtensa/include/asm/timex.h | |||
| @@ -39,9 +39,9 @@ | |||
| 39 | 39 | ||
| 40 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT | 40 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT |
| 41 | extern unsigned long ccount_per_jiffy; | 41 | extern unsigned long ccount_per_jiffy; |
| 42 | extern unsigned long ccount_nsec; | 42 | extern unsigned long nsec_per_ccount; |
| 43 | #define CCOUNT_PER_JIFFY ccount_per_jiffy | 43 | #define CCOUNT_PER_JIFFY ccount_per_jiffy |
| 44 | #define NSEC_PER_CCOUNT ccount_nsec | 44 | #define NSEC_PER_CCOUNT nsec_per_ccount |
| 45 | #else | 45 | #else |
| 46 | #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ)) | 46 | #define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ)) |
| 47 | #define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK) | 47 | #define NSEC_PER_CCOUNT (1000UL / CONFIG_XTENSA_CPU_CLOCK) |