diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
| commit | f4256e301d9800b1e0276404cb01b3ac85b51067 (patch) | |
| tree | 975f56627b78f757608b31684311a24ca1478481 /drivers/scsi/sata_vsc.c | |
| parent | fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff) | |
| parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_vsc.c')
| -rw-r--r-- | drivers/scsi/sata_vsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index e819b2b4f29..1278f631e4d 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c | |||
| @@ -400,7 +400,7 @@ err_out: | |||
| 400 | * 0x8086/0x3200 is the Intel 31244, which is supposed to be identical | 400 | * 0x8086/0x3200 is the Intel 31244, which is supposed to be identical |
| 401 | * compatibility is untested as of yet | 401 | * compatibility is untested as of yet |
| 402 | */ | 402 | */ |
| 403 | static struct pci_device_id vsc_sata_pci_tbl[] = { | 403 | static const struct pci_device_id vsc_sata_pci_tbl[] = { |
| 404 | { 0x1725, 0x7174, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 }, | 404 | { 0x1725, 0x7174, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 }, |
| 405 | { 0x8086, 0x3200, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 }, | 405 | { 0x8086, 0x3200, PCI_ANY_ID, PCI_ANY_ID, 0x10600, 0xFFFFFF, 0 }, |
| 406 | { } | 406 | { } |