diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:45:22 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 11:45:22 +0100 |
commit | a140feab42d1cfd811930ab76104559c19dfc4b0 (patch) | |
tree | 41fd871990e888dd5616a6bf1891a1ff307221df /arch/sparc/kernel/chmc.c | |
parent | lockdep: require framepointers for x86 (diff) | |
parent | Linux 2.6.29-rc7 (diff) | |
download | linux-a140feab42d1cfd811930ab76104559c19dfc4b0.tar.xz linux-a140feab42d1cfd811930ab76104559c19dfc4b0.zip |
Merge commit 'v2.6.29-rc7' into core/locking
Diffstat (limited to 'arch/sparc/kernel/chmc.c')
-rw-r--r-- | arch/sparc/kernel/chmc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c index 3b9f4d6e14a9..e1a9598e2a4d 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; |