git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
drivers
/
serial
/
sunzilog.c
diff --git
a/drivers/serial/sunzilog.c
b/drivers/serial/sunzilog.c
index
b2cc703
..
75de919
100644
(file)
--- a/
drivers/serial/sunzilog.c
+++ b/
drivers/serial/sunzilog.c
@@
-922,8
+922,8
@@
sunzilog_convert_to_zs(struct uart_sunzilog_port *up, unsigned int cflag,
/* The port lock is not held. */
static void
/* The port lock is not held. */
static void
-sunzilog_set_termios(struct uart_port *port, struct termios *termios,
- struct termios *old)
+sunzilog_set_termios(struct uart_port *port, struct
k
termios *termios,
+ struct
k
termios *old)
{
struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
unsigned long flags;
{
struct uart_sunzilog_port *up = (struct uart_sunzilog_port *) port;
unsigned long flags;