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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
atm
/
zatm.c
diff --git
a/drivers/atm/zatm.c
b/drivers/atm/zatm.c
index
752b1ba
..
2e9635b
100644
(file)
--- a/
drivers/atm/zatm.c
+++ b/
drivers/atm/zatm.c
@@
-1517,7
+1517,7
@@
static int zatm_getsockopt(struct atm_vcc *vcc,int level,int optname,
static int zatm_setsockopt(struct atm_vcc *vcc,int level,int optname,
- void __user *optval,int optlen)
+ void __user *optval,
unsigned
int optlen)
{
return -EINVAL;
}