diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-18 04:54:00 -0400 |
| commit | 4741c336d27dec3ea68a35659abb8dc82b142388 (patch) | |
| tree | a8576df82129354b77b0144c480c446ec7aba7b2 /include/scsi/scsi_ioctl.h | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
| parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/scsi/scsi_ioctl.h')
| -rw-r--r-- | include/scsi/scsi_ioctl.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h index d4be4d92d586..edb9525386da 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h | |||
| @@ -41,8 +41,6 @@ typedef struct scsi_fctargaddress { | |||
| 41 | } Scsi_FCTargAddress; | 41 | } Scsi_FCTargAddress; |
| 42 | 42 | ||
| 43 | extern int scsi_ioctl(struct scsi_device *, int, void __user *); | 43 | extern int scsi_ioctl(struct scsi_device *, int, void __user *); |
| 44 | extern int scsi_ioctl_send_command(struct scsi_device *, | ||
| 45 | struct scsi_ioctl_command __user *); | ||
| 46 | extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, | 44 | extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, |
| 47 | void __user *arg, struct file *filp); | 45 | void __user *arg, struct file *filp); |
| 48 | 46 | ||