Merge ../torvalds-2.6/

[sfrench/cifs-2.6.git] / include / linux / chio.h

diff --git a/include/linux/chio.h b/include/linux/chio.h
index 63035ae67e6350881638ed2f64da672b20bda410..a404c111c937a2da3dcddba17f7aba0a63e82cb4 100644 (file)
--- a/include/linux/chio.h
+++ b/include/linux/chio.h
@@ -96,7 +96,7 @@ struct changer_position {
  */
 struct changer_element_status {
        int             ces_type;
-       unsigned char   *ces_data;
+       unsigned char   __user *ces_data;
 };
 #define CESTATUS_FULL     0x01 /* full */
 #define CESTATUS_IMPEXP   0x02 /* media was imported (inserted by sysop) */