Merge branch 'master'

[mv-sheeva.git] / drivers / scsi / sata_promise.c

diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index ac5b9cbebdd8b016fa5966b9ac7ddd19de382b88..7cc96ae0bc1a9266878e81c211527d4c6943019c 100644 (file)
--- 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,