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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
cpu-sa1110.c
diff --git
a/arch/arm/mach-sa1100/cpu-sa1110.c
b/arch/arm/mach-sa1100/cpu-sa1110.c
index
63b32b6
..
7252874
100644
(file)
--- a/
arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/
arch/arm/mach-sa1100/cpu-sa1110.c
@@
-363,6
+363,9
@@
static int __init sa1110_clk_init(void)
struct sdram_params *sdram;
const char *name = sdram_name;
+ if (!cpu_is_sa1110())
+ return -ENODEV;
+
if (!name[0]) {
if (machine_is_assabet())
name = "TC59SM716-CL3";