From 2816d42d648b397ca4da9fdddb6c4beecf9e5cc4 Mon Sep 17 00:00:00 2001
From: Jan Beulich <JBeulich@suse.com>
Date: Mon, 10 Sep 2012 12:05:18 +0000
Subject: [PATCH] --- yaml --- r: 328685 b: refs/heads/master c:
 bbdc18a3fb6740619f0d037241c85dc6cd4517aa h: refs/heads/master i:   328683:
 9fdfa1904784e712ef98035a27071ccdbffb7bcd v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/power/poweroff.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b41e9f017eb2..5d26165e1214 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4955070974ecfa0b1ae9d2506f529460fd3a4b0b
+refs/heads/master: bbdc18a3fb6740619f0d037241c85dc6cd4517aa
diff --git a/trunk/kernel/power/poweroff.c b/trunk/kernel/power/poweroff.c
index d52359374e85..68197a4e8fc9 100644
--- a/trunk/kernel/power/poweroff.c
+++ b/trunk/kernel/power/poweroff.c
@@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_poweroff_op = {
 	.enable_mask	= SYSRQ_ENABLE_BOOT,
 };
 
-static int pm_sysrq_init(void)
+static int __init pm_sysrq_init(void)
 {
 	register_sysrq_key('o', &sysrq_poweroff_op);
 	return 0;