diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 09:06:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 09:06:50 -0700 |
| commit | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (patch) | |
| tree | 73924189ef46511301d004946fbdd9937b00c484 /drivers/scsi/sata_svw.c | |
| parent | e5dfa9282f3db461a896a6692b529e1823ba98c6 (diff) | |
| parent | 26ba2a7a9f4d8921f095af646a7d22c15a148028 (diff) | |
| download | talos-op-linux-5fadd053d9bb4345ec6f405d24db4e7eb49cf81e.tar.gz talos-op-linux-5fadd053d9bb4345ec6f405d24db4e7eb49cf81e.zip | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/sata_svw.c')
| -rw-r--r-- | drivers/scsi/sata_svw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c index d89d968bedac..e0f9570bc6dd 100644 --- a/drivers/scsi/sata_svw.c +++ b/drivers/scsi/sata_svw.c @@ -102,7 +102,7 @@ static void k2_sata_scr_write (struct ata_port *ap, unsigned int sc_reg, } -static void k2_sata_tf_load(struct ata_port *ap, struct ata_taskfile *tf) +static void k2_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) { struct ata_ioports *ioaddr = &ap->ioaddr; unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR; @@ -297,7 +297,7 @@ static Scsi_Host_Template k2_sata_sht = { }; -static struct ata_port_operations k2_sata_ops = { +static const struct ata_port_operations k2_sata_ops = { .port_disable = ata_port_disable, .tf_load = k2_sata_tf_load, .tf_read = k2_sata_tf_read, |
