diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /drivers/scsi/sata_via.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'drivers/scsi/sata_via.c')
| -rw-r--r-- | drivers/scsi/sata_via.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c index 128b996b07b7..80e291a909a9 100644 --- a/drivers/scsi/sata_via.c +++ b/drivers/scsi/sata_via.c | |||
| @@ -109,7 +109,7 @@ static Scsi_Host_Template svia_sht = { | |||
| 109 | .ordered_flush = 1, | 109 | .ordered_flush = 1, |
| 110 | }; | 110 | }; |
| 111 | 111 | ||
| 112 | static struct ata_port_operations svia_sata_ops = { | 112 | static const struct ata_port_operations svia_sata_ops = { |
| 113 | .port_disable = ata_port_disable, | 113 | .port_disable = ata_port_disable, |
| 114 | 114 | ||
| 115 | .tf_load = ata_tf_load, | 115 | .tf_load = ata_tf_load, |
| @@ -212,7 +212,7 @@ static struct ata_probe_ent *vt6420_init_probe_ent(struct pci_dev *pdev) | |||
| 212 | struct ata_probe_ent *probe_ent; | 212 | struct ata_probe_ent *probe_ent; |
| 213 | struct ata_port_info *ppi = &svia_port_info; | 213 | struct ata_port_info *ppi = &svia_port_info; |
| 214 | 214 | ||
| 215 | probe_ent = ata_pci_init_native_mode(pdev, &ppi); | 215 | probe_ent = ata_pci_init_native_mode(pdev, &ppi, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY); |
| 216 | if (!probe_ent) | 216 | if (!probe_ent) |
| 217 | return NULL; | 217 | return NULL; |
| 218 | 218 | ||