diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-09-21 21:03:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:40 -0400 |
| commit | c78968bb0f7714ceba1cdfa23714454fc98cefdf (patch) | |
| tree | cbf066559205ce0d00829c74a406f3a2140623e4 /drivers/ata | |
| parent | 24f756866676b40446e361c1f87738707161da93 (diff) | |
[libata] SCSI: simulator version, not device version, belongs in VPD
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-core.c | 2 | ||||
| -rw-r--r-- | drivers/ata/libata-scsi.c | 5 | ||||
| -rw-r--r-- | drivers/ata/libata.h | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2116f279458..8d425064ce2 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -59,8 +59,6 @@ #include "libata.h" -#define DRV_VERSION "2.21" /* must be exactly four chars */ - /* debounce timing parameters in msecs { interval, duration, timeout } */ const unsigned long sata_deb_timing_normal[] = { 5, 100, 2000 }; diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index d482b589a18..468d791a303 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -1831,8 +1831,9 @@ unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf, pbuf[2] = (0x238 >> 8); /* page size fixed at 238h */ pbuf[3] = (0x238 & 0xff); - memcpy(&pbuf[8], "ATA ", 8); - ata_id_string(args->id, &pbuf[16], ATA_ID_PROD, 16); + memcpy(&pbuf[8], "linux ", 8); + memcpy(&pbuf[16], "libata ", 16); + memcpy(&pbuf[32], DRV_VERSION, 4); ata_id_string(args->id, &pbuf[32], ATA_ID_FW_REV, 4); /* we don't store the ATA device signature, so we fake it */ diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 11f64a43b38..e45f6d5542d 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h @@ -29,6 +29,7 @@ #define __LIBATA_H__ #define DRV_NAME "libata" +#define DRV_VERSION "2.21" /* must be exactly four chars */ struct ata_scsi_args { struct ata_device *dev; |