projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
[powerpc.git]
/
arch
/
um
/
drivers
/
pty.c
diff --git
a/arch/um/drivers/pty.c
b/arch/um/drivers/pty.c
index
0306a1b
..
1c555c3
100644
(file)
--- a/
arch/um/drivers/pty.c
+++ b/
arch/um/drivers/pty.c
@@
-118,13
+118,6
@@
static int pty_open(int input, int output, int primary, void *d,
return(fd);
}
return(fd);
}
-static int pty_console_write(int fd, const char *buf, int n, void *d)
-{
- struct pty_chan *data = d;
-
- return(generic_console_write(fd, buf, n, &data->tt));
-}
-
struct chan_ops pty_ops = {
.type = "pty",
.init = pty_chan_init,
struct chan_ops pty_ops = {
.type = "pty",
.init = pty_chan_init,
@@
-132,7
+125,7
@@
struct chan_ops pty_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
pty
_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,
@@
-145,7
+138,7
@@
struct chan_ops pts_ops = {
.close = generic_close,
.read = generic_read,
.write = generic_write,
.close = generic_close,
.read = generic_read,
.write = generic_write,
- .console_write =
pty
_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,