diff options
| author | Christoph Hellwig <hch@lst.de> | 2002-11-19 07:08:26 -0600 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2002-11-19 07:08:26 -0600 |
| commit | 3e880ac5af2d6cc0bc2a0941e4f39bf8cfdce39f (patch) | |
| tree | bf06ab8c0cd91065f15e8710942657bccd18e4a0 /include/scsi | |
| parent | 78d78c9d5932e5634995418f8eebb5aaac1f432c (diff) | |
[PATCH] make scsi_ioctl.h useable without including scsi.h
*grr* - silly typedefs..
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_ioctl.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/include/scsi/scsi_ioctl.h b/include/scsi/scsi_ioctl.h index 937cadfb917c..316c2fa044ba 100644 --- a/include/scsi/scsi_ioctl.h +++ b/include/scsi/scsi_ioctl.h @@ -17,6 +17,8 @@ #ifdef __KERNEL__ +struct scsi_device; + /* * Structures used for scsi_ioctl et al. */ @@ -33,19 +35,15 @@ typedef struct scsi_idlun { } Scsi_Idlun; /* Fibre Channel WWN, port_id struct */ -typedef struct scsi_fctargaddress -{ +typedef struct scsi_fctargaddress { __u32 host_port_id; unsigned char host_wwn[8]; // include NULL term. } Scsi_FCTargAddress; -extern int scsi_ioctl (Scsi_Device *dev, int cmd, void *arg); -extern int kernel_scsi_ioctl (Scsi_Device *dev, int cmd, void *arg); -extern int scsi_ioctl_send_command(Scsi_Device *dev, - Scsi_Ioctl_Command *arg); - -#endif - -#endif - +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 *); +#endif /* __KERNEL__ */ +#endif /* _SCSI_IOCTL_H */ |