diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-14 20:48:55 -0400 |
| commit | 2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch) | |
| tree | 86227af3c9ad0d90823e5488a86f7f453ed1837a /include/scsi/scsi_ioctl.h | |
| parent | 201e06279823c73242de987f192f43d2b30e5331 (diff) | |
| parent | 64541d19702cfdb7ea946fdc20faee849f6874b1 (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 | ||