git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
parisc
/
power.c
diff --git
a/drivers/parisc/power.c
b/drivers/parisc/power.c
index
d097e7e
..
ff75e92
100644
(file)
--- a/
drivers/parisc/power.c
+++ b/
drivers/parisc/power.c
@@
-47,7
+47,6
@@
#include <linux/workqueue.h>
#include <asm/pdc.h>
#include <linux/workqueue.h>
#include <asm/pdc.h>
-#include <asm/irq.h>
#include <asm/io.h>
#include <asm/led.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/led.h>
#include <asm/uaccess.h>
@@
-126,11
+125,11
@@
static void process_shutdown(void)
/* wait until the button was pressed for 1 second */
if (shutdown_timer == HZ) {
/* wait until the button was pressed for 1 second */
if (shutdown_timer == HZ) {
+#if defined (DEBUG) || defined(CONFIG_CHASSIS_LCD_LED)
static char msg[] = "Shutting down...";
static char msg[] = "Shutting down...";
+#endif
DPRINTK(KERN_INFO "%s\n", msg);
DPRINTK(KERN_INFO "%s\n", msg);
-#ifdef CONFIG_CHASSIS_LCD_LED
lcd_print(msg);
lcd_print(msg);
-#endif
poweroff();
}
}
poweroff();
}
}