From 069856c76a96dbb375b6d0964a29ed97e98520af Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Sat, 14 Jan 2006 13:21:01 -0800
Subject: [PATCH] --- yaml --- r: 18505 b: refs/heads/master c:
 53df751ccd0a404cca169dbd61bae571cc21559a h: refs/heads/master i:   18503:
 423b326a10ba92050df22056b5859ccd1a1907fe v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kernel/setup.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f5ace1cdb4b9..57bb362a72a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0152fb37603e3a776768794030b809ae77027aa4
+refs/heads/master: 53df751ccd0a404cca169dbd61bae571cc21559a
diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c
index c08325187a46..de8784267473 100644
--- a/trunk/arch/s390/kernel/setup.c
+++ b/trunk/arch/s390/kernel/setup.c
@@ -315,6 +315,11 @@ void machine_power_off(void)
 	_machine_power_off();
 }
 
+/*
+ * Dummy power off function.
+ */
+void (*pm_power_off)(void) = machine_power_off;
+
 static void __init
 add_memory_hole(unsigned long start, unsigned long end)
 {