Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[deliverable/linux.git] / net / compat.c

diff --git a/net/compat.c b/net/compat.c
index c823f6f290cbf6c6399cfae02f17b940052c2c73..6e1b03b51933cf897fc7c24cf1fa4d561b0e6243 100644 (file)
--- a/net/compat.c
+++ b/net/compat.c
@@ -75,7 +75,7 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
 
 /* I've named the args so it is easy to tell whose space the pointers are in. */
 int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
-                  char *kern_address, int mode)
+                  struct sockaddr *kern_address, int mode)
 {
        int tot_len;