aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-04-03 17:37:03 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-03 17:37:03 -0700
commit02c73cea37291723e19210b024765792db4d082f (patch)
tree665402070411968c9c276e1cf6c6d8319a3047e2
parent66804d7cd20f2b580cadbb593bb4851bb5e34dd1 (diff)
downloadhistory-02c73cea37291723e19210b024765792db4d082f.tar.gz
[PATCH] ppc32: use correct sysrq function
We were using an internal sysrq function instead of the exported public interface for registering a sysrq key in arch/ppc/xmon/start.c. This patch fixes it (and eliminates a compiler warning). Signed-off-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ppc/xmon/start.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index 8d3fde10bd70c8..507d4eeffe078b 100644
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -215,9 +215,7 @@ xmon_map_scc(void)
DLAB = 0x80;
#endif /* platform */
-#ifdef CONFIG_MAGIC_SYSRQ
- __sysrq_put_key_op('x', &sysrq_xmon_op);
-#endif
+ register_sysrq_key('x', &sysrq_xmon_op);
}
static int scc_initialized = 0;