fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / scsi / scsi_ioctl.h

diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h
index 316c2fa..edb9525 100644 (file)
--- a/include/scsi/scsi_ioctl.h
+++ b/include/scsi/scsi_ioctl.h
@@ -40,10 +40,9 @@ typedef struct scsi_fctargaddress {
        unsigned char host_wwn[8]; // include NULL term.
 } Scsi_FCTargAddress;
 
-extern int scsi_ioctl(struct scsi_device *, int, void *);
-extern int kernel_scsi_ioctl(struct scsi_device *, int , void *);
-extern int scsi_ioctl_send_command(struct scsi_device *,
-                                  struct scsi_ioctl_command *);
+extern int scsi_ioctl(struct scsi_device *, int, void __user *);
+extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd,
+                                  void __user *arg, struct file *filp);
 
 #endif /* __KERNEL__ */
 #endif /* _SCSI_IOCTL_H */