diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 15:12:58 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-16 15:12:58 -0500 |
commit | 3be4bb06b53df2c0a760eeaa5f53448faddedfca (patch) | |
tree | 67dc02f39e48a8a37d8f3e4a38422d86f5164820 /arch/um/drivers/port_user.c | |
parent | 85d6162d6cea9220e483989817eac0cebc03070e (diff) | |
parent | 7bdd720869ff75700b48b132ee71852615b55808 (diff) |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/um/drivers/port_user.c')
-rw-r--r-- | arch/um/drivers/port_user.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c index ed4a1a6c5d8..c43e8bb3250 100644 --- a/arch/um/drivers/port_user.c +++ b/arch/um/drivers/port_user.c @@ -100,13 +100,6 @@ static void port_close(int fd, void *d) os_close_file(fd); } -static int port_console_write(int fd, const char *buf, int n, void *d) -{ - struct port_chan *data = d; - - return(generic_console_write(fd, buf, n, &data->tt)); -} - struct chan_ops port_ops = { .type = "port", .init = port_init, @@ -114,7 +107,7 @@ struct chan_ops port_ops = { .close = port_close, .read = generic_read, .write = generic_write, - .console_write = port_console_write, + .console_write = generic_console_write, .window_size = generic_window_size, .free = port_free, .winch = 1, |