diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 13:45:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-31 13:45:06 -0400 |
| commit | 7d9ef601ddf0a42d11df3bdaaf28078fd2995eab (patch) | |
| tree | bb681d27103850e1882d375ddce04f18cf42d0c7 /drivers/ata/sata_nv.c | |
| parent | 3b42d28b2a04b3c9830eb865288239d45eccc402 (diff) | |
| parent | 2a3103ce4357a09c2289405f969acec0edf4398f (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] Bump driver versions
ata_piix: implement IOCFG bit18 quirk
libata: implement BROKEN_HPA horkage and apply it to affected drives
sata_promise: FastTrack TX4200 is a second-generation chip
pata_marvell: Add more identifiers
ata_piix: add Satellite U200 to broken suspend list
ata: add ATA_MWDMA* and ATA_SWDMA* defines
ata_piix: IDE mode SATA patch for Intel Tolapai
libata-core: Allow translation setting to fail
Diffstat (limited to 'drivers/ata/sata_nv.c')
| -rw-r--r-- | drivers/ata/sata_nv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 0b58c4df6fd2..40dc73139858 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | #include <linux/libata.h> | 49 | #include <linux/libata.h> |
| 50 | 50 | ||
| 51 | #define DRV_NAME "sata_nv" | 51 | #define DRV_NAME "sata_nv" |
| 52 | #define DRV_VERSION "3.4" | 52 | #define DRV_VERSION "3.5" |
| 53 | 53 | ||
| 54 | #define NV_ADMA_DMA_BOUNDARY 0xffffffffUL | 54 | #define NV_ADMA_DMA_BOUNDARY 0xffffffffUL |
| 55 | 55 | ||