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_nv.c | |
| parent | fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff) | |
| parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_nv.c')
| -rw-r--r-- | drivers/scsi/sata_nv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c index 5b7f7808add9..8fdb2336f6f3 100644 --- a/drivers/scsi/sata_nv.c +++ b/drivers/scsi/sata_nv.c | |||
| @@ -137,7 +137,7 @@ enum nv_host_type | |||
| 137 | CK804 | 137 | CK804 |
| 138 | }; | 138 | }; |
| 139 | 139 | ||
| 140 | static struct pci_device_id nv_pci_tbl[] = { | 140 | static const struct pci_device_id nv_pci_tbl[] = { |
| 141 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA, | 141 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2S_SATA, |
| 142 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE2 }, | 142 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, NFORCE2 }, |
| 143 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA, | 143 | { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE3S_SATA, |