diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 14:50:39 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-11 14:50:39 (GMT) |
| commit | ffb6a445e7cdc03d67f8b9fb2f5afaafd8260b4b (patch) | |
| tree | 931c3c2f1dc483539d2349f05c9bbf1e4447c41f /arch/um/drivers/chan.h | |
| parent | 152fcb2784c9305e19e7caee2932b9e32b0a1d41 (diff) | |
| parent | 2116bda6ad937d7acb6e2316fd9e65ad6ca01d42 (diff) | |
| download | linux-ffb6a445e7cdc03d67f8b9fb2f5afaafd8260b4b.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"This update brings various fixes.
Nothing special...
In my local queue I have some more fixes which will be sent later to
you. 3.9 uncovered strange UML issues. :("
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Use tty_port in SIGWINCH handler
um: Use tty_port_operations->destruct
um: fix build failure due to mess-up of sig_info protorype
um: add missing declaration of 'getrlimit()' and friends
net : enable tx time stamping in the vde driver.
hostfs: fix a not needed double check
Diffstat (limited to 'arch/um/drivers/chan.h')
| -rw-r--r-- | arch/um/drivers/chan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/chan.h b/arch/um/drivers/chan.h index 78f1b89..c512b03 100644 --- a/arch/um/drivers/chan.h +++ b/arch/um/drivers/chan.h @@ -37,7 +37,7 @@ extern int console_write_chan(struct chan *chan, const char *buf, extern int console_open_chan(struct line *line, struct console *co); extern void deactivate_chan(struct chan *chan, int irq); extern void reactivate_chan(struct chan *chan, int irq); -extern void chan_enable_winch(struct chan *chan, struct tty_struct *tty); +extern void chan_enable_winch(struct chan *chan, struct tty_port *port); extern int enable_chan(struct line *line); extern void close_chan(struct line *line); extern int chan_window_size(struct line *line, |