Merge tag 'pm-for-3.4-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[karo-tx-linux.git] / arch / mips / lasat / reset.c

diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c
index 8d7d7a454f9a4e6f439042422842fa87d313419b..e21f0b9a586e649824fb31802bdc817b4f7b7dd1 100644 (file)
--- a/arch/mips/lasat/reset.c
+++ b/arch/mips/lasat/reset.c
@@ -17,11 +17,12 @@
  *
  * Reset the LASAT board.
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
+#include <linux/pm.h>
+
 #include <asm/reboot.h>
-#include <asm/system.h>
 #include <asm/lasat/lasat.h>
+
 #include "picvue.h"
 #include "prom.h"
 
@@ -29,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;
        }
@@ -44,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 (;;) ;
 }
@@ -63,5 +56,5 @@ void lasat_reboot_setup(void)
 {
        _machine_restart = lasat_machine_restart;
        _machine_halt = lasat_machine_halt;
-       _machine_power_off = lasat_machine_halt;
+       pm_power_off = lasat_machine_halt;
 }