diff options
| author | Steve French <stevef@smfhome.smfdom> | 2004-07-12 11:41:31 -0500 |
|---|---|---|
| committer | Steve French <stevef@smfhome.smfdom> | 2004-07-12 11:41:31 -0500 |
| commit | 9ee756ec3c51aa877189d0ef9ee30dbfb77826e1 (patch) | |
| tree | f7ad25b8dba72b82399eeed61494b20be66163d0 /include/linux/kernelcapi.h | |
| parent | d1adec97af8e915b380a9f5cc6f0878c7df894ff (diff) | |
| parent | 99c03b3baec7be629ab139884640b5fcb26bba5f (diff) | |
fix the null pointer sparse warning al viros way (resolving potential merge conflict)
Signed-off-by: Steve French (sfrench@us.ibm.com)
Diffstat (limited to 'include/linux/kernelcapi.h')
| -rw-r--r-- | include/linux/kernelcapi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h index 1d4b1b15d0b8..891bb2cf0aa8 100644 --- a/include/linux/kernelcapi.h +++ b/include/linux/kernelcapi.h @@ -81,7 +81,7 @@ u16 capi20_get_manufacturer(u32 contr, u8 buf[CAPI_MANUFACTURER_LEN]); u16 capi20_get_version(u32 contr, struct capi_version *verp); u16 capi20_get_serial(u32 contr, u8 serial[CAPI_SERIAL_LEN]); u16 capi20_get_profile(u32 contr, struct capi_profile *profp); -int capi20_manufacturer(unsigned int cmd, void *data); +int capi20_manufacturer(unsigned int cmd, void __user *data); /* temporary hack XXX */ void capi20_set_callback(struct capi20_appl *ap, |