[libata] bump versions, add MODULE_VERSION() tags

Also remove dep on CONFIG_EXPERIMENTAL for libata itself,
and several libata drivers.

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 5e1cd79377ed4448e01adf99fcf63a12d7c80a15..aef12d404a78ae1ef6a9574b74edc777e04d5b7c 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -399,7 +399,7 @@ source "drivers/scsi/megaraid/Kconfig.megaraid"
 
 config SCSI_SATA
        bool "Serial ATA (SATA) support"
-       depends on SCSI && EXPERIMENTAL
+       depends on SCSI
        help
          This driver family supports Serial ATA host controllers
          and devices.
@@ -408,15 +408,15 @@ config SCSI_SATA
 
 config SCSI_SATA_AHCI
        tristate "AHCI SATA support"
-       depends on SCSI_SATA && PCI && EXPERIMENTAL
+       depends on SCSI_SATA && PCI
        help
          This option enables support for AHCI Serial ATA.
 
          If unsure, say N.
 
 config SCSI_SATA_SVW
-       tristate "ServerWorks Frodo / Apple K2 SATA support (EXPERIMENTAL)"
-       depends on SCSI_SATA && PCI && EXPERIMENTAL
+       tristate "ServerWorks Frodo / Apple K2 SATA support"
+       depends on SCSI_SATA && PCI
        help
          This option enables support for Broadcom/Serverworks/Apple K2
          SATA support.
@@ -467,7 +467,7 @@ config SCSI_SATA_SIL
 
 config SCSI_SATA_SIS
        tristate "SiS 964/180 SATA support"
-       depends on SCSI_SATA && PCI
+       depends on SCSI_SATA && PCI && EXPERIMENTAL
        help
          This option enables support for SiS Serial ATA 964/180.
 
@@ -483,7 +483,7 @@ config SCSI_SATA_ULI
 
 config SCSI_SATA_VIA
        tristate "VIA SATA support"
-       depends on SCSI_SATA && PCI && EXPERIMENTAL
+       depends on SCSI_SATA && PCI
        help
          This option enables support for VIA Serial ATA.
 
@@ -491,7 +491,7 @@ config SCSI_SATA_VIA
 
 config SCSI_SATA_VITESSE
        tristate "VITESSE VSC-7174 SATA support"
-       depends on SCSI_SATA && PCI && EXPERIMENTAL
+       depends on SCSI_SATA && PCI
        help
          This option enables support for Vitesse VSC7174 Serial ATA.
 

diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index ff2da379d4ad779e974b6c43201550402c6192a1..e0501a699d7caaa680775860accdc4597f4a0822 100644 (file)
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -32,7 +32,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "ata_piix"
-#define DRV_VERSION    "1.02"
+#define DRV_VERSION    "1.03"
 
 enum {
        PIIX_IOCFG              = 0x54, /* IDE I/O configuration register */
@@ -247,6 +247,7 @@ MODULE_AUTHOR("Andre Hedrick, Alan Cox, Andrzej Krzysztofowicz, Jeff Garzik");
 MODULE_DESCRIPTION("SCSI low-level driver for Intel PIIX/ICH ATA controllers");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, piix_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 /**
  *     piix_pata_cbl_detect - Probe host controller cable detect info

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 7f90d47e6ca07b34293c02e5d40fc882ebb3fbeb..43ffe1660786b480f343d985f776b052f82dbedd 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -67,6 +67,7 @@ static struct workqueue_struct *ata_wq;
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("Library module for ATA devices");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(DRV_VERSION);
 
 /**
  *     ata_tf_load - send taskfile registers to host controller

diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 6c3b13ec9823f5a19baed1370631db1ff1ccd593..f54c93152e0929e63043a209aa62d1bb299f04fc 100644 (file)
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -26,7 +26,7 @@
 #define __LIBATA_H__
 
 #define DRV_NAME       "libata"
-#define DRV_VERSION    "1.02"  /* must be exactly four chars */
+#define DRV_VERSION    "1.10"  /* must be exactly four chars */
 
 struct ata_scsi_args {
        u16                     *id;

diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index b90c064359f77aee47bae8bf590d0c9765a7ebe8..36b03d4b0d124fcbb133bb8cc8931e916b6c92e5 100644 (file)
--- 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.03"
+#define DRV_VERSION                    "0.5"
 
 #define NV_PORTS                       2
 #define NV_PIO_MASK                    0x1f
@@ -234,6 +234,7 @@ MODULE_AUTHOR("NVIDIA");
 MODULE_DESCRIPTION("low-level driver for NVIDIA nForce SATA controller");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, nv_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 irqreturn_t nv_interrupt (int irq, void *dev_instance, struct pt_regs *regs)
 {

diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index b4568af3ce43b4111400bcc300a94fbbdcc153d4..4b95f70aa6271831d7829b15d2c19400c6c502b6 100644 (file)
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -40,7 +40,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME       "sata_promise"
-#define DRV_VERSION    "1.00"
+#define DRV_VERSION    "1.01"
 
 
 enum {
@@ -661,6 +661,7 @@ MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("Promise SATA TX2/TX4 low-level driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, pdc_ata_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 module_init(pdc_ata_init);
 module_exit(pdc_ata_exit);

diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index eb1e4db6ca13847ed411b2bb654c295bb66b3d88..80e75bd5a4390289096dced17b74e2a65fb84183 100644 (file)
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -38,7 +38,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sata_sil"
-#define DRV_VERSION    "0.54"
+#define DRV_VERSION    "0.8"
 
 enum {
        sil_3112                = 0,
@@ -190,6 +190,7 @@ MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("low-level driver for Silicon Image SATA controller");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, sil_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 static void sil_post_set_mode (struct ata_port *ap)
 {

diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index d43c8ca061bc9a18206123770612677a131e0d3a..d48e437c91db4c6a6ee75cdf1d8beaa58774c0e5 100644 (file)
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -38,7 +38,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sata_sis"
-#define DRV_VERSION    "0.10"
+#define DRV_VERSION    "0.5"
 
 enum {
        sis_180                 = 0,
@@ -128,6 +128,7 @@ MODULE_AUTHOR("Uwe Koziolek");
 MODULE_DESCRIPTION("low-level driver for Silicon Integratad Systems SATA controller");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, sis_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg)
 {

diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 33dff1fa63d5ebaa5cedb47186e48e85e8ec8938..7a18b994f3a4c0428d0acfa399e111b4c679cc0e 100644 (file)
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -49,7 +49,7 @@
 #endif /* CONFIG_PPC_OF */
 
 #define DRV_NAME       "sata_svw"
-#define DRV_VERSION    "1.04"
+#define DRV_VERSION    "1.05"
 
 /* Taskfile registers offsets */
 #define K2_SATA_TF_CMD_OFFSET          0x00
@@ -470,6 +470,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt");
 MODULE_DESCRIPTION("low-level driver for K2 SATA controller");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, k2_sata_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 module_init(k2_sata_init);
 module_exit(k2_sata_exit);

diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index 6990c62d9be1f871333e3ff2d564416ca514ec79..20a01253b036d3cb975c6967a1493b7cb677a80e 100644 (file)
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -40,7 +40,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME       "sata_sx4"
-#define DRV_VERSION    "0.50"
+#define DRV_VERSION    "0.7"
 
 
 enum {
@@ -1492,6 +1492,7 @@ MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("Promise SATA low-level driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, pdc_sata_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 module_init(pdc_sata_init);
 module_exit(pdc_sata_exit);

diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index 67179edd1f59743d8d5da17cc3eccebeac082b8d..c45b1ee000f21d65bff23a7e7961b3f06ce3204a 100644 (file)
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -32,7 +32,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sata_uli"
-#define DRV_VERSION    "0.11"
+#define DRV_VERSION    "0.2"
 
 enum {
        uli_5289                = 0,
@@ -123,6 +123,7 @@ MODULE_AUTHOR("Peer Chen");
 MODULE_DESCRIPTION("low-level driver for ULi Electronics SATA controller");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, uli_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg)
 {

diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 44ffa9b90b186f4700a4840c0bc98b879ecb575d..5e3d5a60035c7d69f416dc09210c130293e5ed67 100644 (file)
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -38,7 +38,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME       "sata_via"
-#define DRV_VERSION    "0.20"
+#define DRV_VERSION    "1.0"
 
 enum {
        via_sata                = 0,
@@ -138,6 +138,7 @@ MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, svia_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg)
 {

diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index d778aeed919b3394abcaa1ad252127fc2f2fe8da..26c822f1e8e6797ed8462a4e4f96cbd8e05dce43 100644 (file)
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -26,7 +26,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sata_vsc"
-#define DRV_VERSION    "0.01"
+#define DRV_VERSION    "1.0"
 
 /* Interrupt register offsets (from chip base address) */
 #define VSC_SATA_INT_STAT_OFFSET       0x00
@@ -393,6 +393,7 @@ MODULE_AUTHOR("Jeremy Higdon");
 MODULE_DESCRIPTION("low-level driver for Vitesse VSC7174 SATA controller");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, vsc_sata_pci_tbl);
+MODULE_VERSION(DRV_VERSION);
 
 module_init(vsc_sata_init);
 module_exit(vsc_sata_exit);