diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /drivers/scsi/libata.h | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/scsi/libata.h')
| -rw-r--r-- | drivers/scsi/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 6518226b8f87..d90430bbb0de 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #define __LIBATA_H__ | 26 | #define __LIBATA_H__ |
| 27 | 27 | ||
| 28 | #define DRV_NAME "libata" | 28 | #define DRV_NAME "libata" |
| 29 | #define DRV_VERSION "1.10" /* must be exactly four chars */ | 29 | #define DRV_VERSION "1.11" /* must be exactly four chars */ |
| 30 | 30 | ||
| 31 | struct ata_scsi_args { | 31 | struct ata_scsi_args { |
| 32 | u16 *id; | 32 | u16 *id; |