diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-18 00:34:51 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-18 00:34:51 +0100 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /drivers/serial/sa1100.c | |
| parent | [JFFS2] debug.h: include <linux/sched.h> for current->pid (diff) | |
| parent | Linux v2.6.20-rc5 (diff) | |
| download | linux-9cdf083f981b8d37b3212400a359368661385099.tar.xz linux-9cdf083f981b8d37b3212400a359368661385099.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/sa1100.c')
| -rw-r--r-- | drivers/serial/sa1100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c index d4065266b6fc..58a83c27e14b 100644 --- a/drivers/serial/sa1100.c +++ b/drivers/serial/sa1100.c @@ -408,8 +408,8 @@ static void sa1100_shutdown(struct uart_port *port) } static void -sa1100_set_termios(struct uart_port *port, struct termios *termios, - struct termios *old) +sa1100_set_termios(struct uart_port *port, struct ktermios *termios, + struct ktermios *old) { struct sa1100_port *sport = (struct sa1100_port *)port; unsigned long flags; |