Merge branch 'upstream'

14 files changed, 13 insertions, 25 deletions

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 1bd82c4e52a0..0c5f0c844d21 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -48,7 +48,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "ahci"
-#define DRV_VERSION     "1.2"
+#define DRV_VERSION     "1.3"
 
 
 enum {
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 24e71b555172..83839706f5e0 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -93,7 +93,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "ata_piix"
-#define DRV_VERSION     "1.05"
+#define DRV_VERSION     "1.10"
 
 enum {
         PIIX_IOCFG              = 0x54, /* IDE I/O configuration register */
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 31efc2e60b69..e3bd1ddb5387 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -29,7 +29,7 @@
 #define __LIBATA_H__
 
 #define DRV_NAME        "libata"
-#define DRV_VERSION     "1.20"  /* must be exactly four chars */
+#define DRV_VERSION     "1.30"  /* must be exactly four chars */
 
 struct ata_scsi_args {
         struct ata_port         *ap;
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index a4dcb4352206..1fca6f1afa99 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pdc_adma"
-#define DRV_VERSION     "0.03"
+#define DRV_VERSION     "0.04"
 
 /* macro to calculate base address for ATA regs */
 #define ADMA_ATA_REGS(base,port_no)     ((base) + ((port_no) * 0x40))
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index be38f328a479..3a0004c3c8b5 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -44,7 +44,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME                        "sata_nv"
-#define DRV_VERSION                     "0.8"
+#define DRV_VERSION                     "0.9"
 
 enum {
         NV_PORTS                        = 2,
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 322525d84907..03c647cbfb59 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -678,10 +678,6 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
-        /*
-         * If this driver happens to only be useful on Apple's K2, then
-         * we should check that here as it has a normal Serverworks ID
-         */
         rc = pci_enable_device(pdev);
         if (rc)
                 return rc;
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index f86858962fbe..1b7a9316810c 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -41,7 +41,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_qstor"
-#define DRV_VERSION     "0.05"
+#define DRV_VERSION     "0.06"
 
 enum {
         QS_PORTS                = 4,
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index d6c7086a5379..f29c3e733a00 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -46,7 +46,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_sil"
-#define DRV_VERSION     "0.9"
+#define DRV_VERSION     "1.0"
 
 enum {
         /*
@@ -391,10 +391,6 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
-        /*
-         * If this driver happens to only be useful on Apple's K2, then
-         * we should check that here as it has a normal Serverworks ID
-         */
         rc = pci_enable_device(pdev);
         if (rc)
                 return rc;
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index c34f6dabf418..646756abb10e 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -31,7 +31,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "sata_sil24"
-#define DRV_VERSION     "0.23"
+#define DRV_VERSION     "0.24"
 
 /*
  * Port request block (PRB) 32 bytes
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index acc8439dea23..eb3cf5b534dc 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -43,7 +43,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_sis"
-#define DRV_VERSION     "0.5"
+#define DRV_VERSION     "0.6"
 
 enum {
         sis_180                 = 0,
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 724f0ed6a52d..a20bc8154753 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -54,7 +54,7 @@
 #endif /* CONFIG_PPC_OF */
 
 #define DRV_NAME        "sata_svw"
-#define DRV_VERSION     "1.07"
+#define DRV_VERSION     "1.8"
 
 enum {
         /* Taskfile registers offsets */
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 45c78c399bfd..13dba63f6167 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -46,7 +46,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_sx4"
-#define DRV_VERSION     "0.8"
+#define DRV_VERSION     "0.9"
 
 
 enum {
@@ -1376,10 +1376,6 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
         if (!printed_version++)
                 dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
 
-        /*
-         * If this driver happens to only be useful on Apple's K2, then
-         * we should check that here as it has a normal Serverworks ID
-         */
         rc = pci_enable_device(pdev);
         if (rc)
                 return rc;
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 7ac5a5f5a905..513dd78ea6fe 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -37,7 +37,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "sata_uli"
-#define DRV_VERSION     "0.5"
+#define DRV_VERSION     "0.6"
 
 enum {
         uli_5289                = 0,
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 791bf652ba63..de4e0eb224bb 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -47,7 +47,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "1.1"
+#define DRV_VERSION     "1.2"
 
 enum board_ids_enum {
         vt6420,