diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-25 08:52:56 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-25 08:52:56 -0500 |
| commit | 65d76f368295973a35d195c9b13053502a67b6bc (patch) | |
| tree | fa7d9204b2da01a9c53633dda789380cfcad38c6 /arch/mips/include/asm/time.h | |
| parent | dba0a918722ee0f0ba3442575e4448c3ab622be4 (diff) | |
| parent | ed313489badef16d700f5a3be50e8fd8f8294bc8 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/mips/include/asm/time.h')
| -rw-r--r-- | arch/mips/include/asm/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h index d3bd5c5aa2ec..9601ea950542 100644 --- a/arch/mips/include/asm/time.h +++ b/arch/mips/include/asm/time.h | |||
| @@ -63,7 +63,7 @@ static inline int mips_clockevent_init(void) | |||
| 63 | /* | 63 | /* |
| 64 | * Initialize the count register as a clocksource | 64 | * Initialize the count register as a clocksource |
| 65 | */ | 65 | */ |
| 66 | #ifdef CONFIG_CEVT_R4K | 66 | #ifdef CONFIG_CSRC_R4K |
| 67 | extern int init_mips_clocksource(void); | 67 | extern int init_mips_clocksource(void); |
| 68 | #else | 68 | #else |
| 69 | static inline int init_mips_clocksource(void) | 69 | static inline int init_mips_clocksource(void) |