diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 15:47:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-04-14 15:47:45 -0500 |
| commit | 84d891d6727c17832c79ec96d3d107a87d857978 (patch) | |
| tree | a189a4d00c1387e409e2f9808c72c8088728c33b /include/scsi/scsi_ioctl.h | |
| parent | 5bb0b55a3283369f1cd8ac76a6d8bda8e7a77055 (diff) | |
| parent | 7676f83aeb774e7a3abe6af06ec92b29488b5b79 (diff) | |
| download | kernel_samsung_aries-84d891d6727c17832c79ec96d3d107a87d857978.zip kernel_samsung_aries-84d891d6727c17832c79ec96d3d107a87d857978.tar.gz kernel_samsung_aries-84d891d6727c17832c79ec96d3d107a87d857978.tar.bz2 | |
Merge ../scsi-rc-fixes-2.6
Conflicts:
include/scsi/scsi_devinfo.h
Same number for two BLIST flags: BLIST_MAX_512 and BLIST_ATTACH_PQ3
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
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 d4be4d9..edb9525 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h @@ -41,8 +41,6 @@ typedef struct scsi_fctargaddress { } Scsi_FCTargAddress; extern int scsi_ioctl(struct scsi_device *, int, void __user *); -extern int scsi_ioctl_send_command(struct scsi_device *, - struct scsi_ioctl_command __user *); extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, void __user *arg, struct file *filp); |