X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=arch%2Fmips%2Flasat%2Freset.c;h=b1e7a89fb73007353e45778f8eb5c4ecd467f239;hb=HEAD;hp=9e22acf03083217b7687a9997b0e21290797fff3;hpb=6ab3d5624e172c553004ecc862bfeac16d9d68b7;p=safe%2Fjmp%2Flinux-2.6

diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c
index 9e22acf..b1e7a89 100644
--- a/arch/mips/lasat/reset.c
+++ b/arch/mips/lasat/reset.c
@@ -31,14 +31,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 +45,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 (;;) ;
 }