The patch titled serial: MPSC: Remove duplicate SUPPORT_SYSRQ definition has been added to the -mm tree. Its filename is serial-mpsc-remove-duplicate-support_sysrq-definition.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: serial: MPSC: Remove duplicate SUPPORT_SYSRQ definition From: "Mark A. Greer" <mgreer@xxxxxxxxxx> Remove the duplicate definition of SUPPORT_SYSRQ in mpsc driver. Signed-off-by: Mark A. Greer <mgreer@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/mpsc.c | 4 ---- 1 files changed, 4 deletions(-) diff -puN drivers/serial/mpsc.c~serial-mpsc-remove-duplicate-support_sysrq-definition drivers/serial/mpsc.c --- a/drivers/serial/mpsc.c~serial-mpsc-remove-duplicate-support_sysrq-definition +++ a/drivers/serial/mpsc.c @@ -74,10 +74,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 /* _ Patches currently in -mm which might be from mgreer@xxxxxxxxxx are origin.patch serial-mpsc-remove-race-between-rx-stop-restart.patch serial-mpsc-stop-rx-engine-when-cread-cleared.patch serial-mpsc-remove-duplicate-support_sysrq-definition.patch serial-mpsc-fix-coding-style-and-whitespace-issues.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html