summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sata_promise.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-12 05:39:35 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-11-12 05:39:35 +0100
commitf4256e301d9800b1e0276404cb01b3ac85b51067 (patch)
tree975f56627b78f757608b31684311a24ca1478481 /drivers/scsi/sata_promise.c
parentMerge branch 'upstream' (diff)
parentLinux v2.6.15-rc1 (diff)
downloadlinux-f4256e301d9800b1e0276404cb01b3ac85b51067.tar.xz
linux-f4256e301d9800b1e0276404cb01b3ac85b51067.zip
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/sata_promise.c')
-rw-r--r--drivers/scsi/sata_promise.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index ac5b9cbebdd8..7cc96ae0bc1a 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -196,7 +196,7 @@ static struct ata_port_info pdc_port_info[] = {
},
};
-static struct pci_device_id pdc_ata_pci_tbl[] = {
+static const struct pci_device_id pdc_ata_pci_tbl[] = {
{ PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_2037x },
{ PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,