From 456eb30a283afa292ae33a2f4716586ec6362337 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Fri, 11 Jul 2008 22:39:18 +0900 Subject: [PATCH] --- yaml --- r: 101459 b: refs/heads/master c: 3f16654f36723f5ef1ca38c4e2078ca377a0f86f h: refs/heads/master i: 101457: 24ac511b868ef5819a836518a3203282351e1bdd 101455: 6a7a997f6c02cd26be975e1952fe27b375525dfd v: v3 --- [refs] | 2 +- trunk/arch/mips/gt64120/wrppmc/reset.c | 5 ----- trunk/arch/mips/gt64120/wrppmc/setup.c | 3 +-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 765e63d33920..4620cbf8e079 100644 --- 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 index e66c87164a02..cc5474b24f06 100644 --- 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 index 728ef6a80edd..ca65c84031a7 100644 --- 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