From 59b2a9025ea9b98f46d5518eccd68bdadd760caa Mon Sep 17 00:00:00 2001
From: Sergei Shtylylov <sshtylyov@ru.mvista.com>
Date: Tue, 14 Mar 2006 07:20:00 +0300
Subject: [PATCH] --- yaml --- r: 21099 b: refs/heads/master c:
 86dde15b3dc36dda4bbc32a8da607675ce63ef23 h: refs/heads/master i:   21097:
 b922c894f14b4726b79a9aeca14d5747bad5d6f5   21095:
 dbd6d0111c0cc8d019b30678a6d4f9c17d38b948 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/au1000/common/reset.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 16f3f4e3f6a1..a784f3d8b994 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de62893bc0725f8b5f0445250577cd7a10b2d8f8
+refs/heads/master: 86dde15b3dc36dda4bbc32a8da607675ce63ef23
diff --git a/trunk/arch/mips/au1000/common/reset.c b/trunk/arch/mips/au1000/common/reset.c
index 4ffccedf5967..96a211400f34 100644
--- a/trunk/arch/mips/au1000/common/reset.c
+++ b/trunk/arch/mips/au1000/common/reset.c
@@ -164,13 +164,13 @@ void au1000_restart(char *command)
 
 void au1000_halt(void)
 {
-#if defined(CONFIG_MIPS_PB1550)
+#if defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550)
 	/* power off system */
-	printk("\n** Powering off Pb1550\n");
+	printk("\n** Powering off...\n");
 	au_writew(au_readw(0xAF00001C) | (3<<14), 0xAF00001C);
 	au_sync();
 	while(1); /* should not get here */
-#endif
+#else
 	printk(KERN_NOTICE "\n** You can safely turn off the power\n");
 #ifdef CONFIG_MIPS_MIRAGE
 	au_writel((1 << 26) | (1 << 10), GPIO2_OUTPUT);
@@ -187,6 +187,7 @@ void au1000_halt(void)
 	                "wait\n\t"
 			".set\tmips0");
 #endif
+#endif /* defined(CONFIG_MIPS_PB1550) || defined(CONFIG_MIPS_DB1550) */
 }
 
 void au1000_power_off(void)