aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/chmc.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-03-10 15:17:26 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-03-10 15:17:26 +0900
commite161183ba674f97fce748384f5bb037d07bdc5c9 (patch)
tree5b3bd4b995f6435ee977b71082244fa1a647f717 /arch/sparc/kernel/chmc.c
parent2ef7f0dab6b3d171b6aff00a47077385ae3155b5 (diff)
parent99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc/kernel/chmc.c')
-rw-r--r--arch/sparc/kernel/chmc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c
index 3b9f4d6e14a..e1a9598e2a4 100644
--- a/arch/sparc/kernel/chmc.c
+++ b/arch/sparc/kernel/chmc.c
@@ -306,6 +306,7 @@ static int jbusmc_print_dimm(int syndrome_code,
buf[1] = '?';
buf[2] = '?';
buf[3] = '\0';
+ return 0;
}
p = dp->controller;
prop = &p->layout;