projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
drivers
/
serial
/
serial_txx9.c
diff --git
a/drivers/serial/serial_txx9.c
b/drivers/serial/serial_txx9.c
index
2a48289
..
7186a82
100644
(file)
--- a/
drivers/serial/serial_txx9.c
+++ b/
drivers/serial/serial_txx9.c
@@
-556,8
+556,8
@@
static void serial_txx9_shutdown(struct uart_port *port)
}
static void
}
static void
-serial_txx9_set_termios(struct uart_port *port, struct termios *termios,
- struct termios *old)
+serial_txx9_set_termios(struct uart_port *port, struct
k
termios *termios,
+ struct
k
termios *old)
{
struct uart_txx9_port *up = (struct uart_txx9_port *)port;
unsigned int cval, fcr = 0;
{
struct uart_txx9_port *up = (struct uart_txx9_port *)port;
unsigned int cval, fcr = 0;