Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / net / atm / common.h

diff --git a/net/atm/common.h b/net/atm/common.h
index 92e2981f479f920f0dfe3815cd9c5734af81a3aa..f48a76b6cdf48845a5834800f6716113c9c95914 100644 (file)
--- a/net/atm/common.h
+++ b/net/atm/common.h
@@ -21,7 +21,7 @@ unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait);
 int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int vcc_setsockopt(struct socket *sock, int level, int optname,
-                  char __user *optval, int optlen);
+                  char __user *optval, unsigned int optlen);
 int vcc_getsockopt(struct socket *sock, int level, int optname,
                   char __user *optval, int __user *optlen);