git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
asm
/
time.h
diff --git
a/arch/mips/include/asm/time.h
b/arch/mips/include/asm/time.h
index 38a30d2ee959c8fdad41eeb94de5ba13b499eee6..df6a430de5eb508dd6a33a457b84f7ec623cbb3a 100644
(file)
--- a/
arch/mips/include/asm/time.h
+++ b/
arch/mips/include/asm/time.h
@@
-57,7
+57,11
@@
extern int r4k_clockevent_init(void);
static inline int mips_clockevent_init(void)
{
static inline int mips_clockevent_init(void)
{
-#ifdef CONFIG_CEVT_R4K
+#ifdef CONFIG_MIPS_MT_SMTC
+ extern int smtc_clockevent_init(void);
+
+ return smtc_clockevent_init();
+#elif defined(CONFIG_CEVT_R4K)
return r4k_clockevent_init();
#else
return -ENXIO;
return r4k_clockevent_init();
#else
return -ENXIO;