Merge commit 'v2.6.31-rc4' into next

[~andy/linux] / arch / parisc / kernel / process.c

diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 61c07078c072d69c60769e4273339c3ac8fe8d62..1f3aa8db02030a1509253b6d0d51d4910f522761 100644 (file)
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -156,7 +156,7 @@ void machine_power_off(void)
         * software. The user has to press the button himself. */
 
        printk(KERN_EMERG "System shut down completed.\n"
-              KERN_EMERG "Please power this system off now.");
+              "Please power this system off now.");
 }
 
 void (*pm_power_off)(void) = machine_power_off;