From 37983467be2bcd9cbb95c10bf145abd5fea60a2a Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Sat, 4 Aug 2007 23:24:51 +0900
Subject: [PATCH] --- yaml --- r: 64483 b: refs/heads/master c:
 dee3c75058485d55c8188a13d660d72188c5bcee h: refs/heads/master i:   64481:
 02e3ceecab4755f72336263f1aa05f8967eb77d9   64479:
 299b725e762207fbf7e35f5ea80fff67a3e52230 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/mips/sni/reset.c | 4 ----
 trunk/arch/mips/sni/setup.c | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 589ba1ff4607..19da67777263 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d3fdeacee5d071a5c3d674231bf00cfa5d35a7a
+refs/heads/master: dee3c75058485d55c8188a13d660d72188c5bcee
diff --git a/trunk/arch/mips/sni/reset.c b/trunk/arch/mips/sni/reset.c
index 2eada8aea682..38b6a97a31b5 100644
--- a/trunk/arch/mips/sni/reset.c
+++ b/trunk/arch/mips/sni/reset.c
@@ -40,10 +40,6 @@ void sni_machine_restart(char *command)
 	}
 }
 
-void sni_machine_halt(void)
-{
-}
-
 void sni_machine_power_off(void)
 {
 	*(volatile unsigned char *)PCIMT_CSWCSM = 0xfd;
diff --git a/trunk/arch/mips/sni/setup.c b/trunk/arch/mips/sni/setup.c
index 4fedfbda0c79..6edbb3051c82 100644
--- a/trunk/arch/mips/sni/setup.c
+++ b/trunk/arch/mips/sni/setup.c
@@ -26,7 +26,6 @@
 unsigned int sni_brd_type;
 
 extern void sni_machine_restart(char *command);
-extern void sni_machine_halt(void);
 extern void sni_machine_power_off(void);
 
 static void __init sni_display_setup(void)
@@ -87,7 +86,6 @@ void __init plat_mem_setup(void)
 	}
 
 	_machine_restart = sni_machine_restart;
-	_machine_halt = sni_machine_halt;
 	pm_power_off = sni_machine_power_off;
 
 	sni_display_setup();