projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
csrc-r4k.c
diff --git
a/arch/mips/kernel/csrc-r4k.c
b/arch/mips/kernel/csrc-r4k.c
index
74fb745
..
f1a2893
100644
(file)
--- a/
arch/mips/kernel/csrc-r4k.c
+++ b/
arch/mips/kernel/csrc-r4k.c
@@
-22,7
+22,7
@@
static struct clocksource clocksource_mips = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
-int __init init_
mips
_clocksource(void)
+int __init init_
r4k
_clocksource(void)
{
if (!cpu_has_counter || !mips_hpt_frequency)
return -ENXIO;