git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4
/
probe.c
diff --git
a/arch/sh/kernel/cpu/sh4/probe.c
b/arch/sh/kernel/cpu/sh4/probe.c
index
822977a
..
d180f16
100644
(file)
--- a/
arch/sh/kernel/cpu/sh4/probe.c
+++ b/
arch/sh/kernel/cpu/sh4/probe.c
@@
-15,7
+15,7
@@
#include <asm/processor.h>
#include <asm/cache.h>
-
int __init detect_cpu_and_cache_system
(void)
+
void __cpuinit cpu_probe
(void)
{
unsigned long pvr, prr, cvr;
unsigned long size;
@@
-251,6
+251,4
@@
int __init detect_cpu_and_cache_system(void)
boot_cpu_data.scache.linesz);
}
}
-
- return 0;
}