git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
lasat
/
reset.c
diff --git
a/arch/mips/lasat/reset.c
b/arch/mips/lasat/reset.c
index 181bf68175fccf18255c81079928e56d6b8df83f..b1e7a89fb73007353e45778f8eb5c4ecd467f239 100644
(file)
--- a/
arch/mips/lasat/reset.c
+++ b/
arch/mips/lasat/reset.c
@@
-17,7
+17,6
@@
*
* Reset the LASAT board.
*/
*
* Reset the LASAT board.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/pm.h>
#include <linux/kernel.h>
#include <linux/pm.h>
@@
-32,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 */
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) {
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;
}
*(volatile unsigned int *)0xa0000024 = 0xdeadbeef;
*(volatile unsigned int *)0xa00000fc = 0xfedeabba;
}
@@
-47,17
+45,10
@@
static void lasat_machine_restart(char *command)
for (;;) ;
}
for (;;) ;
}
-#define MESSAGE "System halted"
static void lasat_machine_halt(void)
{
local_irq_disable();
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 (;;) ;
}
prom_monitor();
for (;;) ;
}