aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/lasat/reset.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/lasat/reset.c')
-rw-r--r--arch/mips/lasat/reset.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c
index 9e22acf0308..e21f0b9a586 100644
--- a/arch/mips/lasat/reset.c
+++ b/arch/mips/lasat/reset.c
@@ -21,7 +21,6 @@
#include <linux/pm.h>
#include <asm/reboot.h>
-#include <asm/system.h>
#include <asm/lasat/lasat.h>
#include "picvue.h"
@@ -31,14 +30,13 @@ static void lasat_machine_restart(char *command);
static void lasat_machine_halt(void);
/* Used to set machine to boot in service mode via /proc interface */
-int lasat_boot_to_service = 0;
+int lasat_boot_to_service;
static void lasat_machine_restart(char *command)
{
local_irq_disable();
if (lasat_boot_to_service) {
- printk("machine_restart: Rebooting to service mode\n");
*(volatile unsigned int *)0xa0000024 = 0xdeadbeef;
*(volatile unsigned int *)0xa00000fc = 0xfedeabba;
}
@@ -46,17 +44,10 @@ static void lasat_machine_restart(char *command)
for (;;) ;
}
-#define MESSAGE "System halted"
static void lasat_machine_halt(void)
{
local_irq_disable();
- /* Disable interrupts and loop forever */
- printk(KERN_NOTICE MESSAGE "\n");
-#ifdef CONFIG_PICVUE
- pvc_clear();
- pvc_write_string(MESSAGE, 0, 0);
-#endif
prom_monitor();
for (;;) ;
}