Merge branch 'master'

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

diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index c42b2d3eeb6cb0df2eb609a2686658a97d48b660..daeaf68743de7d0b294f7d5384b6f06b8fbe7ee8 100644 (file)
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -230,7 +230,7 @@ static struct ata_port_info pdc_port_info[] = {
 
 };
 
-static struct pci_device_id pdc_sata_pci_tbl[] = {
+static const struct pci_device_id pdc_sata_pci_tbl[] = {
        { PCI_VENDOR_ID_PROMISE, 0x6622, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
          board_20621 },
        { }     /* terminate list */