diff options
| author | Linus Torvalds | 2005-10-28 18:06:50 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-10-28 18:06:50 +0200 |
| commit | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (patch) | |
| tree | 73924189ef46511301d004946fbdd9937b00c484 /drivers/scsi/sata_uli.c | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| parent | Merge branch 'master' (diff) | |
| download | kernel-qcow2-linux-5fadd053d9bb4345ec6f405d24db4e7eb49cf81e.tar.gz kernel-qcow2-linux-5fadd053d9bb4345ec6f405d24db4e7eb49cf81e.tar.xz kernel-qcow2-linux-5fadd053d9bb4345ec6f405d24db4e7eb49cf81e.zip | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/sata_uli.c')
| -rw-r--r-- | drivers/scsi/sata_uli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c index 4c9fb8b71be1..d68dc7d3422c 100644 --- a/drivers/scsi/sata_uli.c +++ b/drivers/scsi/sata_uli.c @@ -90,7 +90,7 @@ static Scsi_Host_Template uli_sht = { .ordered_flush = 1, }; -static struct ata_port_operations uli_ops = { +static const struct ata_port_operations uli_ops = { .port_disable = ata_port_disable, .tf_load = ata_tf_load, @@ -202,7 +202,7 @@ static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) goto err_out_regions; ppi = &uli_port_info; - probe_ent = ata_pci_init_native_mode(pdev, &ppi); + probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); if (!probe_ent) { rc = -ENOMEM; goto err_out_regions; |