diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:44:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:44:34 -0400 |
| commit | 04fc5fd39e09c460fd478ea84b34c445dd376759 (patch) | |
| tree | 320731ed5046fc33f77ad957bb3fd7b5eaa4b5fe /drivers/ata/sata_sis.c | |
| parent | 8aee74c8ee875448cc6d1cf995c9469eb60ae515 (diff) | |
| parent | 8bc3fc470eb25af4d70c72485cbcb130cc657691 (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 versions
libata: Trim trailing whitespace
libata: Kiss post_set_mode goodbye
ata_piix: clean up
pata_hpt366: Enable bits are unreliable so don't use them
libata: Add Seagate STT20000A to DMA blacklist.
ahci: disable 64bit dma on sb600
Diffstat (limited to 'drivers/ata/sata_sis.c')
| -rw-r--r-- | drivers/ata/sata_sis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c index ee66c5fa7ac8..51d9251b0898 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | #include "sis.h" | 43 | #include "sis.h" |
| 44 | 44 | ||
| 45 | #define DRV_NAME "sata_sis" | 45 | #define DRV_NAME "sata_sis" |
| 46 | #define DRV_VERSION "0.7" | 46 | #define DRV_VERSION "0.8" |
| 47 | 47 | ||
| 48 | enum { | 48 | enum { |
| 49 | sis_180 = 0, | 49 | sis_180 = 0, |