2006-03-22 19:07:56

by Mark A. Greer

[permalink] [raw]
Subject: [PATCH 2.6.16-rc6-mm2] serial: mpsc driver has definition of SUPPORT_SYSRQ below include of serial_core.h

The definition of SUPPORT_SYSRQ must come before #include of serial_core.h.
This patch moves the definition of SUPPORT_SYSRQ to be just after the
#include of config.h to make it consistent with 8250.c.

Reported-by: Stephane Chazelas <[email protected]>
Signed-off-by: Mark A. Greer <[email protected]>
---

mpsc.h | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---

diff -Nurp linux-2.6.16-rc6-mm2-mpsc_namefix/drivers/serial/mpsc.h linux-2.6.16-rc6-mm2-mpsc_sysrq/drivers/serial/mpsc.h
--- linux-2.6.16-rc6-mm2-mpsc_namefix/drivers/serial/mpsc.h 2006-03-11 15:12:55.000000000 -0700
+++ linux-2.6.16-rc6-mm2-mpsc_sysrq/drivers/serial/mpsc.h 2006-03-22 11:50:28.000000000 -0700
@@ -13,6 +13,11 @@
#define __MPSC_H__

#include <linux/config.h>
+
+#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
+#define SUPPORT_SYSRQ
+#endif
+
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/tty.h>
@@ -31,10 +36,6 @@
#include <asm/io.h>
#include <asm/irq.h>

-#if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
#define MPSC_NUM_CTLRS 2

/*