From 2c68b94e0073a35392ef106a902d94f6e3aa9d8f Mon Sep 17 00:00:00 2001
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Date: Sun, 22 Jul 2007 13:06:49 +0900
Subject: [PATCH] --- yaml --- r: 62840 b: refs/heads/master c:
 34ec6e76a6354b04df3d2e94cd34d27af76a07bc h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 692a3b70fdc7..41bdf6e8d258 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeea55163dac3e891558253751fcbfa0815a2e1a
+refs/heads/master: 34ec6e76a6354b04df3d2e94cd34d27af76a07bc
diff --git a/trunk/arch/mips/jazz/reset.c b/trunk/arch/mips/jazz/reset.c
index 2a9754750bc8..d8ade85060b3 100644
--- a/trunk/arch/mips/jazz/reset.c
+++ b/trunk/arch/mips/jazz/reset.c
@@ -6,10 +6,6 @@
  */
 #include <linux/jiffies.h>
 #include <asm/jazz.h>
-#include <asm/io.h>
-#include <asm/system.h>
-#include <asm/reboot.h>
-#include <asm/delay.h>
 
 #define KBD_STAT_IBF		0x02	/* Keyboard input buffer full */
 
@@ -58,12 +54,3 @@ void jazz_machine_restart(char *command)
 		jazz_write_output (0x00);
 	}
 }
-
-void jazz_machine_halt(void)
-{
-}
-
-void jazz_machine_power_off(void)
-{
-	/* Jazz machines don't have a software power switch */
-}
diff --git a/trunk/arch/mips/jazz/setup.c b/trunk/arch/mips/jazz/setup.c
index 81ec559a1c26..798279e06691 100644
--- a/trunk/arch/mips/jazz/setup.c
+++ b/trunk/arch/mips/jazz/setup.c
@@ -34,8 +34,6 @@
 extern asmlinkage void jazz_handle_int(void);
 
 extern void jazz_machine_restart(char *command);
-extern void jazz_machine_halt(void);
-extern void jazz_machine_power_off(void);
 
 void __init plat_timer_setup(struct irqaction *irq)
 {
@@ -95,8 +93,6 @@ void __init plat_mem_setup(void)
 	/* The RTC is outside the port address space */
 
 	_machine_restart = jazz_machine_restart;
-	_machine_halt = jazz_machine_halt;
-	pm_power_off = jazz_machine_power_off;
 
 	screen_info = (struct screen_info) {
 		0, 0,		/* orig-x, orig-y */