git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
um
/
drivers
/
tty.c
diff --git
a/arch/um/drivers/tty.c
b/arch/um/drivers/tty.c
index
6fbb670
..
94c9265
100644
(file)
--- a/
arch/um/drivers/tty.c
+++ b/
arch/um/drivers/tty.c
@@
-60,13
+60,6
@@
static int tty_open(int input, int output, int primary, void *d,
return(fd);
}
return(fd);
}
-static int tty_console_write(int fd, const char *buf, int n, void *d)
-{
- struct tty_chan *data = d;
-
- return(generic_console_write(fd, buf, n, &data->tt));
-}
-
struct chan_ops tty_ops = {
.type = "tty",
.init = tty_chan_init,
struct chan_ops tty_ops = {
.type = "tty",
.init = tty_chan_init,
@@
-74,7
+67,7
@@
struct chan_ops tty_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
tty
_console_write,
+ .console_write =
generic
_console_write,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,
.window_size = generic_window_size,
.free = generic_free,
.winch = 0,