diff options
author | Mark A. Greer <mgreer@mvista.com> | 2006-03-25 06:08:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:23:02 -0500 |
commit | 6261c8e34f07f09270b37e14c05962c952cbeebe (patch) | |
tree | 0778accb4d59ed82e5b5275f1efecc874debd174 /drivers/serial | |
parent | a30ff2e348af9d3a1782103130c88960550a773f (diff) |
[PATCH] 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 <Stephane@artesyncp.com>
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/mpsc.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/serial/mpsc.h b/drivers/serial/mpsc.h index 678dbcf06c8f..15913300cea7 100644 --- a/drivers/serial/mpsc.h +++ b/drivers/serial/mpsc.h | |||
@@ -13,6 +13,11 @@ | |||
13 | #define __MPSC_H__ | 13 | #define __MPSC_H__ |
14 | 14 | ||
15 | #include <linux/config.h> | 15 | #include <linux/config.h> |
16 | |||
17 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | ||
18 | #define SUPPORT_SYSRQ | ||
19 | #endif | ||
20 | |||
16 | #include <linux/module.h> | 21 | #include <linux/module.h> |
17 | #include <linux/moduleparam.h> | 22 | #include <linux/moduleparam.h> |
18 | #include <linux/tty.h> | 23 | #include <linux/tty.h> |
@@ -31,10 +36,6 @@ | |||
31 | #include <asm/io.h> | 36 | #include <asm/io.h> |
32 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
33 | 38 | ||
34 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | ||
35 | #define SUPPORT_SYSRQ | ||
36 | #endif | ||
37 | |||
38 | #define MPSC_NUM_CTLRS 2 | 39 | #define MPSC_NUM_CTLRS 2 |
39 | 40 | ||
40 | /* | 41 | /* |