e4528126de
Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
25 lines
651 B
Diff
25 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
|