Commit cbd6064e authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

[PATCH] PA-RISC power controller update

 - Small cleanups to LED/LCD support code

From: Grant Grundler <grundler@parisc-linux.org>
 - asm/irq.h is unnecessary
Signed-off-by: default avatarMatthew Wilcox <willy@parisc-linux.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 12aaf8e1
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <asm/pdc.h> #include <asm/pdc.h>
#include <asm/irq.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/led.h> #include <asm/led.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -126,11 +125,11 @@ static void process_shutdown(void) ...@@ -126,11 +125,11 @@ static void process_shutdown(void)
/* wait until the button was pressed for 1 second */ /* wait until the button was pressed for 1 second */
if (shutdown_timer == HZ) { 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();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment