diff --git a/[refs] b/[refs]
index e2f02d61833a..f7c997358b45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25b73c783dd87de66383ea16606a8c4f8ebb1e0a
+refs/heads/master: 9be56c6432633b706ab4bb961997f1d851b39535
diff --git a/trunk/drivers/staging/comedi/comedi.h b/trunk/drivers/staging/comedi/comedi.h
index 76cdb2c8bb7f..133f013e0f6d 100644
--- a/trunk/drivers/staging/comedi/comedi.h
+++ b/trunk/drivers/staging/comedi/comedi.h
@@ -365,7 +365,7 @@ struct comedi_cmd {
 	unsigned int stop_src;
 	unsigned int stop_arg;
 
-	unsigned int __user *chanlist;	/* channel/range list */
+	unsigned int *chanlist;	/* channel/range list */
 	unsigned int chanlist_len;
 
 	short __user *data; /* data list, size depends on subd flags */