This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / arch / ppc / xmon / start.c

diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index 8d3fde1..d880967 100644 (file)
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/sysrq.h>
-#include <linux/bitops.h>
 #include <asm/xmon.h>
 #include <asm/prom.h>
 #include <asm/bootx.h>
@@ -22,6 +21,9 @@
 #include <asm/processor.h>
 #include <asm/delay.h>
 #include <asm/btext.h>
+#ifdef CONFIG_SMP
+#include <asm/bitops.h>
+#endif
 
 static volatile unsigned char *sccc, *sccd;
 unsigned int TXRDY, RXRDY, DLAB;
@@ -102,7 +104,7 @@ static struct sysrq_key_op sysrq_xmon_op =
 {
        .handler =      sysrq_handle_xmon,
        .help_msg =     "Xmon",
-       .action_msg =   "Entering xmon",
+       .action_msg =   "Entering xmon\n",
 };
 #endif