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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
net
/
wanrouter
/
wanproc.c
diff --git
a/net/wanrouter/wanproc.c
b/net/wanrouter/wanproc.c
index
5bebe40
..
267f7ff
100644
(file)
--- a/
net/wanrouter/wanproc.c
+++ b/
net/wanrouter/wanproc.c
@@
-278,7
+278,7
@@
static const struct file_operations wandev_fops = {
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
- .
ioctl
= wanrouter_ioctl,
+ .
unlocked_ioctl
= wanrouter_ioctl,
};
/*