projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[linux-2.6-block.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh5
/
probe.c
diff --git
a/arch/sh/kernel/cpu/sh5/probe.c
b/arch/sh/kernel/cpu/sh5/probe.c
index 521d05b3f7ba1d528acda149330fe6e3818f1280..9e882409e4e981ae90ca3f262d6010df594c9216 100644
(file)
--- a/
arch/sh/kernel/cpu/sh5/probe.c
+++ b/
arch/sh/kernel/cpu/sh5/probe.c
@@
-17,7
+17,7
@@
#include <asm/cache.h>
#include <asm/tlb.h>
-
int __init detect_cpu_and_cache_system
(void)
+
void __cpuinit cpu_probe
(void)
{
unsigned long long cir;
@@
-72,6
+72,4
@@
int __init detect_cpu_and_cache_system(void)
/* Setup some I/D TLB defaults */
sh64_tlb_init();
-
- return 0;
}