diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 22:30:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-29 22:30:03 -0400 |
| commit | 79158229b09873ca296ac53de5c952488f944646 (patch) | |
| tree | 5ebf559f71fd4f4e4cbf12f5cd97242da53d9af7 /drivers/scsi/libata.h | |
| parent | 7ce54e3f428b33af714271140601c87b8bf2c544 (diff) | |
| parent | 7238cfb3342078ad6d1dd06c7b567da428672476 (diff) | |
Automatic merge of 'misc-fixes' branch from
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
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; |