diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:04 -0400 |
| commit | b2382b363df828f25e35ed8b70a3da33b29b2a64 (patch) | |
| tree | 23aa2e70ba4650390c9281b3696172313bdb0f38 /drivers/scsi/libata.h | |
| parent | 1b5cca3a88b7682d538d129c25f0e3092613a243 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into ieee80211.
Hand-fix merge conflict in drivers/usb/net/zd1201.c.
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 d90430bbb0de..3e7f4843020f 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.11" /* must be exactly four chars */ | 29 | #define DRV_VERSION "1.12" /* must be exactly four chars */ |
| 30 | 30 | ||
| 31 | struct ata_scsi_args { | 31 | struct ata_scsi_args { |
| 32 | u16 *id; | 32 | u16 *id; |