diff options
Diffstat (limited to 'drivers/message/fusion/mptctl.c')
| -rw-r--r-- | drivers/message/fusion/mptctl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c index 602138f8544d..7c340240a50e 100644 --- a/drivers/message/fusion/mptctl.c +++ b/drivers/message/fusion/mptctl.c | |||
| @@ -1245,7 +1245,7 @@ mptctl_gettargetinfo (unsigned long arg) | |||
| 1245 | MPT_ADAPTER *ioc; | 1245 | MPT_ADAPTER *ioc; |
| 1246 | struct Scsi_Host *sh; | 1246 | struct Scsi_Host *sh; |
| 1247 | MPT_SCSI_HOST *hd; | 1247 | MPT_SCSI_HOST *hd; |
| 1248 | VirtDevice *vdev; | 1248 | VirtTarget *vdev; |
| 1249 | char *pmem; | 1249 | char *pmem; |
| 1250 | int *pdata; | 1250 | int *pdata; |
| 1251 | IOCPage2_t *pIoc2; | 1251 | IOCPage2_t *pIoc2; |
| @@ -1822,7 +1822,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) | |||
| 1822 | case MPI_FUNCTION_SCSI_IO_REQUEST: | 1822 | case MPI_FUNCTION_SCSI_IO_REQUEST: |
| 1823 | if (ioc->sh) { | 1823 | if (ioc->sh) { |
| 1824 | SCSIIORequest_t *pScsiReq = (SCSIIORequest_t *) mf; | 1824 | SCSIIORequest_t *pScsiReq = (SCSIIORequest_t *) mf; |
| 1825 | VirtDevice *pTarget = NULL; | 1825 | VirtTarget *pTarget = NULL; |
| 1826 | MPT_SCSI_HOST *hd = NULL; | 1826 | MPT_SCSI_HOST *hd = NULL; |
| 1827 | int qtag = MPI_SCSIIO_CONTROL_UNTAGGED; | 1827 | int qtag = MPI_SCSIIO_CONTROL_UNTAGGED; |
| 1828 | int scsidir = 0; | 1828 | int scsidir = 0; |
| @@ -2585,8 +2585,6 @@ static struct miscdevice mptctl_miscdev = { | |||
| 2585 | 2585 | ||
| 2586 | #ifdef CONFIG_COMPAT | 2586 | #ifdef CONFIG_COMPAT |
| 2587 | 2587 | ||
| 2588 | #include <linux/ioctl32.h> | ||
| 2589 | |||
| 2590 | static int | 2588 | static int |
| 2591 | compat_mptfwxfer_ioctl(struct file *filp, unsigned int cmd, | 2589 | compat_mptfwxfer_ioctl(struct file *filp, unsigned int cmd, |
| 2592 | unsigned long arg) | 2590 | unsigned long arg) |
