Merge tag 'tty-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / drivers / tty / serial / dz.c

diff --git a/drivers/tty/serial/dz.c b/drivers/tty/serial/dz.c
index 730da41..4552742 100644 (file)
--- a/drivers/tty/serial/dz.c
+++ b/drivers/tty/serial/dz.c
@@ -29,10 +29,6 @@
 
 #undef DEBUG_DZ
 
-#if defined(CONFIG_SERIAL_DZ_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
-#define SUPPORT_SYSRQ
-#endif
-
 #include <linux/bitops.h>
 #include <linux/compiler.h>
 #include <linux/console.h>
@@ -787,6 +783,7 @@ static void __init dz_init_ports(void)
                uport->ops      = &dz_ops;
                uport->line     = line;
                uport->mapbase  = base;
+               uport->has_sysrq = IS_ENABLED(CONFIG_SERIAL_DZ_CONSOLE);
        }
 }