[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: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index d097e7ecdf8eaaf2ffec4f323d0ce7888f543b0d..ff75e9296df988031cb9a99cfe6fe52a50dd1e63 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 <asm/irq.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) {
+#if defined (DEBUG) || defined(CONFIG_CHASSIS_LCD_LED)
                static char msg[] = "Shutting down...";
+#endif
                DPRINTK(KERN_INFO "%s\n", msg);
-#ifdef CONFIG_CHASSIS_LCD_LED
                lcd_print(msg);
-#endif
                poweroff();
        }
 }