patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / linux / atmdev.h

diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 9242c9c..b19303d 100644 (file)
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -351,11 +351,11 @@ struct atmdev_ops { /* only send is required */
        void (*dev_close)(struct atm_dev *dev);
        int (*open)(struct atm_vcc *vcc);
        void (*close)(struct atm_vcc *vcc);
-       int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void *arg);
+       int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void __user *arg);
        int (*getsockopt)(struct atm_vcc *vcc,int level,int optname,
-           void *optval,int optlen);
+           void __user *optval,int optlen);
        int (*setsockopt)(struct atm_vcc *vcc,int level,int optname,
-           void *optval,int optlen);
+           void __user *optval,int optlen);
        int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
        int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);
        void (*phy_put)(struct atm_dev *dev,unsigned char value,
@@ -368,7 +368,7 @@ struct atmdev_ops { /* only send is required */
 
 struct atmphy_ops {
        int (*start)(struct atm_dev *dev);
-       int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void *arg);
+       int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void __user *arg);
        void (*interrupt)(struct atm_dev *dev);
        int (*stop)(struct atm_dev *dev);
 };