diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:29:23 -0400 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /drivers/scsi/sata_mv.c | |
| parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index be7c378dcd36..1d6d0c9e76f6 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <asm/io.h> | 35 | #include <asm/io.h> |
| 36 | 36 | ||
| 37 | #define DRV_NAME "sata_mv" | 37 | #define DRV_NAME "sata_mv" |
| 38 | #define DRV_VERSION "0.24" | 38 | #define DRV_VERSION "0.25" |
| 39 | 39 | ||
| 40 | enum { | 40 | enum { |
| 41 | /* BAR's are enumerated in terms of pci_resource_start() terms */ | 41 | /* BAR's are enumerated in terms of pci_resource_start() terms */ |
| @@ -290,7 +290,7 @@ static Scsi_Host_Template mv_sht = { | |||
| 290 | .ordered_flush = 1, | 290 | .ordered_flush = 1, |
| 291 | }; | 291 | }; |
| 292 | 292 | ||
| 293 | static struct ata_port_operations mv_ops = { | 293 | static const struct ata_port_operations mv_ops = { |
| 294 | .port_disable = ata_port_disable, | 294 | .port_disable = ata_port_disable, |
| 295 | 295 | ||
| 296 | .tf_load = ata_tf_load, | 296 | .tf_load = ata_tf_load, |