diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-12 16:54:16 -0400 |
| commit | 875999c5539999f61a45620aae0c3e5fb1d2b035 (patch) | |
| tree | 4535032a8a10f5782c0aef6a620b1a624ea9f863 /drivers/scsi/sata_sis.c | |
| parent | 79072f38909e3d9883317238887460c39ddcc4cb (diff) | |
| parent | 26ec634c31a11a003040e10b4d650495158632fd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_sis.c')
| -rw-r--r-- | drivers/scsi/sata_sis.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c index acc8439dea23..3097821688dc 100644 --- a/drivers/scsi/sata_sis.c +++ b/drivers/scsi/sata_sis.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include <linux/libata.h> | 43 | #include <linux/libata.h> |
| 44 | 44 | ||
| 45 | #define DRV_NAME "sata_sis" | 45 | #define DRV_NAME "sata_sis" |
| 46 | #define DRV_VERSION "0.5" | 46 | #define DRV_VERSION "0.6" |
| 47 | 47 | ||
| 48 | enum { | 48 | enum { |
| 49 | sis_180 = 0, | 49 | sis_180 = 0, |
| @@ -87,7 +87,6 @@ static struct scsi_host_template sis_sht = { | |||
| 87 | .name = DRV_NAME, | 87 | .name = DRV_NAME, |
| 88 | .ioctl = ata_scsi_ioctl, | 88 | .ioctl = ata_scsi_ioctl, |
| 89 | .queuecommand = ata_scsi_queuecmd, | 89 | .queuecommand = ata_scsi_queuecmd, |
| 90 | .eh_strategy_handler = ata_scsi_error, | ||
| 91 | .can_queue = ATA_DEF_QUEUE, | 90 | .can_queue = ATA_DEF_QUEUE, |
| 92 | .this_id = ATA_SHT_THIS_ID, | 91 | .this_id = ATA_SHT_THIS_ID, |
| 93 | .sg_tablesize = ATA_MAX_PRD, | 92 | .sg_tablesize = ATA_MAX_PRD, |