summaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_uli.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-21 17:44:34 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-21 17:44:34 -0700
commit04fc5fd39e09c460fd478ea84b34c445dd376759 (patch)
tree320731ed5046fc33f77ad957bb3fd7b5eaa4b5fe /drivers/ata/sata_uli.c
parent8aee74c8ee875448cc6d1cf995c9469eb60ae515 (diff)
parent8bc3fc470eb25af4d70c72485cbcb130cc657691 (diff)
downloadop-kernel-dev-04fc5fd39e09c460fd478ea84b34c445dd376759.zip
op-kernel-dev-04fc5fd39e09c460fd478ea84b34c445dd376759.tar.gz
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_uli.c')
-rw-r--r--drivers/ata/sata_uli.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 006f5e3..6815de7 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -36,7 +36,7 @@
#include <linux/libata.h>
#define DRV_NAME "sata_uli"
-#define DRV_VERSION "1.1"
+#define DRV_VERSION "1.2"
enum {
uli_5289 = 0,
OpenPOWER on IntegriCloud