From 82511b127e9acbed62aed4dde338e23ff4644321 Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Tue, 2 Oct 2007 23:21:36 +0900 Subject: [PATCH] --- yaml --- r: 66197 b: refs/heads/master c: f13558c2a4a7339192ff7148ee903340affdb790 h: refs/heads/master i: 66195: 6c0a1e9d1047ddaffbf7c8ca59e12bd2d8da46a1 v: v3 --- [refs] | 2 +- trunk/arch/mips/cobalt/reset.c | 9 --------- trunk/arch/mips/cobalt/setup.c | 3 +-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 8d96c5a55097..88cd88f1a9f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3282bd3cb0c7653e604c0d3666331281ae8f74c4 +refs/heads/master: f13558c2a4a7339192ff7148ee903340affdb790 diff --git a/trunk/arch/mips/cobalt/reset.c b/trunk/arch/mips/cobalt/reset.c index 81628b3ae621..71eb4ccc4bc1 100644 --- a/trunk/arch/mips/cobalt/reset.c +++ b/trunk/arch/mips/cobalt/reset.c @@ -61,12 +61,3 @@ void cobalt_machine_restart(char *command) /* we should never get here */ cobalt_machine_halt(); } - -/* - * This triggers the luser mode device driver for the power switch ;-) - */ -void cobalt_machine_power_off(void) -{ - printk("You can switch the machine off now.\n"); - cobalt_machine_halt(); -} diff --git a/trunk/arch/mips/cobalt/setup.c b/trunk/arch/mips/cobalt/setup.c index 345e4ae998df..d11bb1bc7b6b 100644 --- a/trunk/arch/mips/cobalt/setup.c +++ b/trunk/arch/mips/cobalt/setup.c @@ -25,7 +25,6 @@ extern void cobalt_machine_restart(char *command); extern void cobalt_machine_halt(void); -extern void cobalt_machine_power_off(void); const char *get_system_type(void) { @@ -96,7 +95,7 @@ void __init plat_mem_setup(void) _machine_restart = cobalt_machine_restart; _machine_halt = cobalt_machine_halt; - pm_power_off = cobalt_machine_power_off; + pm_power_off = cobalt_machine_halt; set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));