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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
drivers
/
char
/
esp.c
diff --git
a/drivers/char/esp.c
b/drivers/char/esp.c
index
93b5519
..
d1bfbaa
100644
(file)
--- a/
drivers/char/esp.c
+++ b/
drivers/char/esp.c
@@
-1915,7
+1915,7
@@
static int rs_ioctl(struct tty_struct *tty, struct file * file,
return 0;
}
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 esp_struct *info = (struct esp_struct *)tty->driver_data;
unsigned long flags;
{
struct esp_struct *info = (struct esp_struct *)tty->driver_data;
unsigned long flags;