Merge branch 'master'

[net-next-2.6.git] / drivers / scsi / sata_mv.c

diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index be7c378dcd365ae6162b6e119e002051e475ad4d..1d6d0c9e76f6e13e90f0a1d2e39d1503885a1ed9 100644 (file)
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -35,7 +35,7 @@
 #include <asm/io.h>
 
 #define DRV_NAME       "sata_mv"
-#define DRV_VERSION    "0.24"
+#define DRV_VERSION    "0.25"
 
 enum {
        /* BAR's are enumerated in terms of pci_resource_start() terms */
@@ -290,7 +290,7 @@ static Scsi_Host_Template mv_sht = {
        .ordered_flush          = 1,
 };
 
-static struct ata_port_operations mv_ops = {
+static const struct ata_port_operations mv_ops = {
        .port_disable           = ata_port_disable,
 
        .tf_load                = ata_tf_load,