---

yaml --- r: 101459 b: refs/heads/master c: 3f16654 h: refs/heads/master i: 101457: 24ac511 101455: 6a7a997 v: v3
git-mirror · Jul 15, 2008 · 456eb30 · 456eb30
1 parent 0c42a50
commit 456eb30
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ecb1ff1b295a515b21d0ac83d8bd39b07335aab
+refs/heads/master: 3f16654f36723f5ef1ca38c4e2078ca377a0f86f
diff --git a/trunk/arch/mips/gt64120/wrppmc/reset.c b/trunk/arch/mips/gt64120/wrppmc/reset.c
@@ -38,8 +38,3 @@ void wrppmc_machine_halt(void)
 			cpu_wait();
 	}
 }
-
-void wrppmc_machine_power_off(void)
-{
-	wrppmc_machine_halt();
-}
diff --git a/trunk/arch/mips/gt64120/wrppmc/setup.c b/trunk/arch/mips/gt64120/wrppmc/setup.c
@@ -98,11 +98,10 @@ void __init plat_mem_setup(void)
 {
 	extern void wrppmc_machine_restart(char *command);
 	extern void wrppmc_machine_halt(void);
-	extern void wrppmc_machine_power_off(void);
 
 	_machine_restart = wrppmc_machine_restart;
 	_machine_halt	 = wrppmc_machine_halt;
-	pm_power_off	 = wrppmc_machine_power_off;
+	pm_power_off	 = wrppmc_machine_halt;
 
 	/* This makes the operations of 'in/out[bwl]' to the
 	 * physical address ( < KSEG0) can work via KSEG1