summaryrefslogtreecommitdiff
path: root/include/linux/chio.h
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2005-09-12 19:45:04 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-12 19:45:04 (GMT)
commitd58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch)
treed9a7e35eb88fea6265d5aadcc3d4ed39122b052a /include/linux/chio.h
parent877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff)
parent2ade81473636b33aaac64495f89a7dc572c529f0 (diff)
downloadlinux-fsl-qoriq-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.xz
Merge ../torvalds-2.6/
Diffstat (limited to 'include/linux/chio.h')
-rw-r--r--include/linux/chio.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/chio.h b/include/linux/chio.h
index 63035ae..a404c11 100644
--- 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) */