diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 13:13:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 13:13:48 -0800 |
| commit | c93fc2873edcd3eae0ed11ba288a77f3ef62e92b (patch) | |
| tree | 25b71493b3edf8e8fae4b219e1c8b1911eb41d60 /arch/mips/include/asm/time.h | |
| parent | e3b4ae79e91447bbd883df12d52ef2be9b12be61 (diff) | |
| parent | a24e849c019f15796984be9fe301fa9ead6f0f9e (diff) | |
| download | kernel_samsung_smdk4412-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.zip kernel_samsung_smdk4412-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.tar.gz kernel_samsung_smdk4412-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol.
MIPS: csrc-r4k: Fix spelling mistake.
MIPS: RB532: Provide functions for gpio configuration
MIPS: IP22: Make indy_sc_ops variable static
MIPS: RB532: GPIO register offsets are relative to GPIOBASE
MIPS: Malta: Fix include paths in malta-amon.c
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 d3bd5c5..9601ea9 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) /* * Initialize the count register as a clocksource */ -#ifdef CONFIG_CEVT_R4K +#ifdef CONFIG_CSRC_R4K extern int init_mips_clocksource(void); #else static inline int init_mips_clocksource(void) |