From 25fdd6904411afc39ff2746c1e3c8ce201a868cf Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yuasa@linux-mips.org>
Date: Fri, 18 Dec 2009 21:33:46 +0900
Subject: [PATCH] --- yaml --- r: 179150 b: refs/heads/master c:
 2620c3570f748647afb17e095507099a309ed8f6 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/mips/powertv/reset.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index ac04672e7ebe..5cd33253f410 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09b7c9f24d8e9b772da682b52b83c88f426a849d
+refs/heads/master: 2620c3570f748647afb17e095507099a309ed8f6
diff --git a/trunk/arch/mips/powertv/reset.c b/trunk/arch/mips/powertv/reset.c
index 494c652c984b..0007652cb774 100644
--- a/trunk/arch/mips/powertv/reset.c
+++ b/trunk/arch/mips/powertv/reset.c
@@ -28,9 +28,6 @@
 #include <asm/mach-powertv/asic_regs.h>
 #include "reset.h"
 
-static void mips_machine_restart(char *command);
-static void mips_machine_halt(void);
-
 static void mips_machine_restart(char *command)
 {
 #ifdef CONFIG_BOOTLOADER_DRIVER
@@ -44,22 +41,7 @@ static void mips_machine_restart(char *command)
 #endif
 }
 
-static void mips_machine_halt(void)
-{
-#ifdef CONFIG_BOOTLOADER_DRIVER
-	/*
-	 * Call the bootloader's reset function to ensure
-	 * that persistent data is flushed before hard reset
-	 */
-	kbldr_SetCauseAndReset();
-#else
-	writel(0x1, asic_reg_addr(watchdog));
-#endif
-}
-
 void mips_reboot_setup(void)
 {
 	_machine_restart = mips_machine_restart;
-	_machine_halt = mips_machine_halt;
-	pm_power_off = mips_machine_halt;
 }