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:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
drivers
/
char
/
n_hdlc.c
diff --git
a/drivers/char/n_hdlc.c
b/drivers/char/n_hdlc.c
index 69ec6399c714b206ea11de8c30d8ba75fd0a9bd6..bacb3e2872ae49cbc5668e6a402cb50fbf75a30b 100644
(file)
--- a/
drivers/char/n_hdlc.c
+++ b/
drivers/char/n_hdlc.c
@@
-764,7
+764,7
@@
static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
break;
default:
- error = n_tty_ioctl
(tty, file, cmd, arg);
+ error = n_tty_ioctl
_helper
(tty, file, cmd, arg);
break;
}
return error;