diff options
| author |   Grant Likely <grant.likely@secretlab.ca> | 2010-12-29 22:20:30 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-29 22:21:47 -0700 |
| commit | d392da5207352f09030e95d9ea335a4225667ec0 (patch) | |
| tree | 7d6cd1932afcad0a5619a5c504a6d93ca318187c /include/linux/socket.h | |
| parent | powerpc/5xxx: extend mpc8xxx_gpio driver to support mpc512x gpios (diff) | |
| parent | Linux 2.6.37-rc8 (diff) | |
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index a2fada9becb6..86b652fabf6e 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -326,7 +326,6 @@ extern int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *ad extern int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len); extern int memcpy_toiovecend(const struct iovec *v, unsigned char *kdata, int offset, int len); -extern int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr, int __user *ulen); extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); |