Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[karo-tx-linux.git] / include / linux / dccp.h

diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index d6f4ec467a4bb9f273c7fdea7d7a04b08fbcee7a..53553c99cad636c888900bd0b63698b2f4a81b43 100644 (file)
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -191,7 +191,7 @@ enum {
 /* this structure is argument to DCCP_SOCKOPT_CHANGE_X */
 struct dccp_so_feat {
        __u8 dccpsf_feat;
-       __u8 *dccpsf_val;
+       __u8 __user *dccpsf_val;
        __u8 dccpsf_len;
 };