git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[sfrench/cifs-2.6.git]
/
drivers
/
serial
/
68328serial.c
diff --git
a/drivers/serial/68328serial.c
b/drivers/serial/68328serial.c
index 9b8b585513ec5aaeccf108f0d0a0498b174a7ea3..cad426c9711e970d0b7d62718bf894b7ca54536c 100644
(file)
--- a/
drivers/serial/68328serial.c
+++ b/
drivers/serial/68328serial.c
@@
-1061,7
+1061,7
@@
static int rs_ioctl(struct tty_struct *tty, struct file * file,
return 0;
}
-static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void rs_set_termios(struct tty_struct *tty, struct
k
termios *old_termios)
{
struct m68k_serial *info = (struct m68k_serial *)tty->driver_data;