summaryrefslogtreecommitdiffstats
path: root/drivers/atm/eni.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-03 07:10:07 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-11-03 07:10:07 +0100
commit7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1 (patch)
tree19dec256fc80ad06d631ece78b9eb68a457ce66b /drivers/atm/eni.c
parentInput: atkbd - add a quirk for OQO 01+ multimedia keys (diff)
parentLinux 2.6.32-rc5 (diff)
downloadlinux-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.tar.xz
linux-7a53c7f56bbfc9b0ef892e68f5cfae3d902544d1.zip
Merge commit 'v2.6.32-rc5' into for-linus
Diffstat (limited to 'drivers/atm/eni.c')
-rw-r--r--drivers/atm/eni.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 5503bfc8e132..0c3026145443 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2031,7 +2031,7 @@ static int eni_getsockopt(struct atm_vcc *vcc,int level,int optname,
static int eni_setsockopt(struct atm_vcc *vcc,int level,int optname,
- void __user *optval,int optlen)
+ void __user *optval,unsigned int optlen)
{
return -EINVAL;
}