74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
24 lines
651 B
Diff
24 lines
651 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
|
|
@@ -91,6 +91,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 SERIAL_8250_GSC
|
|
tristate
|
|
depends on SERIAL_8250 && GSC
|