1513b39a8c
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43093
24 lines
633 B
Diff
24 lines
633 B
Diff
--- a/drivers/tty/serial/8250/8250_core.c
|
|
+++ b/drivers/tty/serial/8250/8250_core.c
|
|
@@ -16,7 +16,7 @@
|
|
* membase is an 'ioremapped' cookie.
|
|
*/
|
|
|
|
-#if defined(CONFIG_SERIAL_8250_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
|
|
+#if defined(CONFIG_SERIAL_8250_SYSRQ) && defined(CONFIG_MAGIC_SYSRQ)
|
|
#define SUPPORT_SYSRQ
|
|
#endif
|
|
|
|
--- a/drivers/tty/serial/8250/Kconfig
|
|
+++ b/drivers/tty/serial/8250/Kconfig
|
|
@@ -90,6 +90,10 @@ config SERIAL_8250_CONSOLE
|
|
|
|
If unsure, say N.
|
|
|
|
+config SERIAL_8250_SYSRQ
|
|
+ bool "Magic sysrq support on 8250/16550 devices"
|
|
+ depends on SERIAL_8250_CONSOLE
|
|
+
|
|
config FIX_EARLYCON_MEM
|
|
bool
|
|
depends on X86
|