diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 16:33:43 -0400 |
| commit | c9802cd9574a80444e689c7525627b40d7dc3a06 (patch) | |
| tree | 5954e2ac7e97023b51d36127963a1e9262fbcfe0 /drivers/scsi/a3000.h | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
| parent | 2d2f8d59b14bec6c745e219a350ac51d9e00673f (diff) | |
Merge mulgrave-w:git/scsi-misc-2.6
Conflicts:
drivers/scsi/iscsi_tcp.c
drivers/scsi/iscsi_tcp.h
Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/a3000.h')
| -rw-r--r-- | drivers/scsi/a3000.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/a3000.h b/drivers/scsi/a3000.h index 5535a65150a4..44a4ec7b4650 100644 --- a/drivers/scsi/a3000.h +++ b/drivers/scsi/a3000.h | |||
| @@ -13,10 +13,6 @@ | |||
| 13 | 13 | ||
| 14 | int a3000_detect(struct scsi_host_template *); | 14 | int a3000_detect(struct scsi_host_template *); |
| 15 | int a3000_release(struct Scsi_Host *); | 15 | int a3000_release(struct Scsi_Host *); |
| 16 | const char *wd33c93_info(void); | ||
| 17 | int wd33c93_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); | ||
| 18 | int wd33c93_abort(Scsi_Cmnd *); | ||
| 19 | int wd33c93_reset(Scsi_Cmnd *, unsigned int); | ||
| 20 | 16 | ||
| 21 | #ifndef CMD_PER_LUN | 17 | #ifndef CMD_PER_LUN |
| 22 | #define CMD_PER_LUN 2 | 18 | #define CMD_PER_LUN 2 |