Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv31851/drivers/char
Modified Files:
dz.c
Log Message:
Merge with Linus' 2.5.2 release
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dz.c 20 May 2002 00:33:35 -0000 1.2
+++ dz.c 5 Jun 2002 21:55:03 -0000 1.3
@@ -83,7 +83,6 @@
DECLARE_TASK_QUEUE(tq_serial);
-extern wait_queue_head_t keypress_wait;
static struct dz_serial *lines[4];
static unsigned char tmp_buffer[256];
@@ -234,8 +233,6 @@
if (info->is_console) {
if (ch == 0)
return; /* it's a break ... */
-
- wake_up (&keypress_wait); /* It is a 'keyboard interrupt' ;-) */
}
#endif
@@ -1318,7 +1315,7 @@
struct dz_serial *info;
int retval, line;
- line = MINOR(tty->device) - tty->driver.minor_start;
+ line = minor(tty->device) - tty->driver.minor_start;
/*
* The dz lines for the mouse/keyboard must be opened using their
@@ -1636,14 +1633,9 @@
}
}
-static int dz_console_wait_key(struct console *co)
-{
- return 0;
-}
-
static kdev_t dz_console_device(struct console *c)
{
- return MKDEV(TTY_MAJOR, 64 + c->index);
+ return mk_kdev(TTY_MAJOR, 64 + c->index);
}
static int __init dz_console_setup(struct console *co, char *options)
@@ -1746,13 +1738,12 @@
}
static struct console dz_sercons = {
- name: "ttyS",
- write: dz_console_print,
- device: dz_console_device,
- wait_key: dz_console_wait_key,
- setup: dz_console_setup,
- flags: CON_CONSDEV | CON_PRINTBUFFER,
- index: CONSOLE_LINE,
+ name: "ttyS",
+ write: dz_console_print,
+ device: dz_console_device,
+ setup: dz_console_setup,
+ flags: CON_CONSDEV | CON_PRINTBUFFER,
+ index: CONSOLE_LINE,
};
void __init dz_serial_console_init(void)
|
