Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv4668/drivers/char
Modified Files:
Kconfig Makefile sysrq.c tty_io.c
Log Message:
Syned to BK tree. Shrink the diff size.
Index: Kconfig
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Kconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Kconfig 28 Oct 2003 07:17:36 -0000 1.3
+++ Kconfig 14 Nov 2003 17:44:22 -0000 1.4
@@ -36,11 +36,11 @@
shiny Linux system :-)
config VT_BDSM
- bool "ISO6429 bidirectional support"
- depends on VT
- ---help---
- If you say yes you will get support for the ability to type left to
- right or right to left.
+ bool "ISO6429 bidirectional support"
+ depends on VT
+ ---help---
+ If you say yes you will get support for the ability to type left to
+ right or right to left.
config VT_CONSOLE
bool "Support for console on virtual terminal" if EMBEDDED
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile 28 Oct 2003 07:17:36 -0000 1.4
+++ Makefile 14 Nov 2003 17:44:22 -0000 1.5
@@ -42,7 +42,7 @@
obj-$(CONFIG_SH_SCI) += sh-sci.o generic_serial.o
obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o
obj-$(CONFIG_RAW_DRIVER) += raw.o
-obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o
+obj-$(CONFIG_SGI_L1_SERIAL) += sn_serial.o
obj-$(CONFIG_PRINTER) += lp.o
obj-$(CONFIG_TIPAR) += tipar.o
Index: sysrq.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/sysrq.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sysrq.c 2 Oct 2003 09:32:18 -0000 1.2
+++ sysrq.c 14 Nov 2003 17:44:22 -0000 1.3
@@ -36,6 +36,7 @@
#include <asm/ptrace.h>
+
/* Whether we react on sysrq keys or just ignore them */
int sysrq_enabled = 1;
Index: tty_io.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/tty_io.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- tty_io.c 28 Oct 2003 07:17:36 -0000 1.5
+++ tty_io.c 14 Nov 2003 17:44:22 -0000 1.6
@@ -1490,6 +1490,7 @@
#ifdef CONFIG_VT
if (tty->driver->type == TTY_DRIVER_TYPE_CONSOLE) {
struct vc_data *vc = (struct vc_data *) tty->driver_data;
+
if (!vc || vc_resize(vc, tmp_ws.ws_col, tmp_ws.ws_row))
return -ENXIO;
}
@@ -2372,6 +2373,7 @@
}
EXPORT_SYMBOL(tty_unregister_driver);
+
/*
* Initialize the console device. This is called *early*, so
|
