diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-14 05:28:58 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-14 05:28:58 +0100 |
| commit | 7b0a65f9923ffe7885a5473648baaa3a1a701726 (patch) | |
| tree | b9be4a0504b4e637b86bdc92d88268ff57ea1bc5 /arch/um/include/chan_user.h | |
| parent | Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (diff) | |
| download | linux-7b0a65f9923ffe7885a5473648baaa3a1a701726.tar.xz linux-7b0a65f9923ffe7885a5473648baaa3a1a701726.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/include/chan_user.h')
| -rw-r--r-- | arch/um/include/chan_user.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/chan_user.h b/arch/um/include/chan_user.h index f77d9aa4c164..659bb3cac32f 100644 --- a/arch/um/include/chan_user.h +++ b/arch/um/include/chan_user.h @@ -25,7 +25,7 @@ struct chan_ops { void (*close)(int, void *); int (*read)(int, char *, void *); int (*write)(int, const char *, int, void *); - int (*console_write)(int, const char *, int, void *); + int (*console_write)(int, const char *, int); int (*window_size)(int, void *, unsigned short *, unsigned short *); void (*free)(void *); int winch; @@ -37,7 +37,7 @@ extern struct chan_ops fd_ops, null_ops, port_ops, pts_ops, pty_ops, tty_ops, extern void generic_close(int fd, void *unused); extern int generic_read(int fd, char *c_out, void *unused); extern int generic_write(int fd, const char *buf, int n, void *unused); -extern int generic_console_write(int fd, const char *buf, int n, void *state); +extern int generic_console_write(int fd, const char *buf, int n); extern int generic_window_size(int fd, void *unused, unsigned short *rows_out, unsigned short *cols_out); extern void generic_free(void *data); |