diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-13 19:11:27 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-13 19:11:27 -0400 |
commit | 5006d1aae813727cc77cc56cca9e90ef748650ce (patch) | |
tree | c24a6c2adff1cb311f5f94b3e6357313006fd14d /arch/powerpc/platforms/52xx/mpc52xx_common.c | |
parent | 22d660ffd0db8d136b122751287d186e869ca474 (diff) | |
parent | 4c3ed7d61bd474380e0d3e1eb0da164942f7c84e (diff) |
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'arch/powerpc/platforms/52xx/mpc52xx_common.c')
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c index 4d5fd1dbd40..044b4e6e874 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_common.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c | |||
@@ -90,7 +90,7 @@ mpc5200_setup_xlb_arbiter(void) | |||
90 | of_node_put(np); | 90 | of_node_put(np); |
91 | if (!xlb) { | 91 | if (!xlb) { |
92 | printk(KERN_ERR __FILE__ ": " | 92 | printk(KERN_ERR __FILE__ ": " |
93 | "Error mapping XLB in mpc52xx_setup_cpu(). " | 93 | "Error mapping XLB in mpc52xx_setup_cpu(). " |
94 | "Expect some abnormal behavior\n"); | 94 | "Expect some abnormal behavior\n"); |
95 | return; | 95 | return; |
96 | } | 96 | } |
@@ -216,7 +216,8 @@ mpc52xx_restart(char *cmd) | |||
216 | out_be32(&mpc52xx_wdt->count, 0x000000ff); | 216 | out_be32(&mpc52xx_wdt->count, 0x000000ff); |
217 | out_be32(&mpc52xx_wdt->mode, 0x00009004); | 217 | out_be32(&mpc52xx_wdt->mode, 0x00009004); |
218 | } else | 218 | } else |
219 | printk("mpc52xx_restart: Can't access wdt. " | 219 | printk(KERN_ERR __FILE__ ": " |
220 | "mpc52xx_restart: Can't access wdt. " | ||
220 | "Restart impossible, system halted.\n"); | 221 | "Restart impossible, system halted.\n"); |
221 | 222 | ||
222 | while (1); | 223 | while (1); |