diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 08:42:02 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-20 08:42:02 -0500 |
| commit | a02001086bbfb4da35d1228bebc2f1b442db455f (patch) | |
| tree | 62ab47936cef06fd08657ca5b6cd1df98c19be57 /drivers/scsi/isci | |
| parent | eff264efeeb0898408e8c9df72d8a32621035bed (diff) | |
| parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
Merge Linus' tree to be be to apply submitted patches to newer code than
current trivial.git base
Diffstat (limited to 'drivers/scsi/isci')
| -rw-r--r-- | drivers/scsi/isci/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 4198e45ea941..2e890b1e2526 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
| @@ -75,7 +75,7 @@ MODULE_VERSION(DRV_VERSION); | |||
| 75 | 75 | ||
| 76 | static struct scsi_transport_template *isci_transport_template; | 76 | static struct scsi_transport_template *isci_transport_template; |
| 77 | 77 | ||
| 78 | static DEFINE_PCI_DEVICE_TABLE(isci_id_table) = { | 78 | static const struct pci_device_id isci_id_table[] = { |
| 79 | { PCI_VDEVICE(INTEL, 0x1D61),}, | 79 | { PCI_VDEVICE(INTEL, 0x1D61),}, |
| 80 | { PCI_VDEVICE(INTEL, 0x1D63),}, | 80 | { PCI_VDEVICE(INTEL, 0x1D63),}, |
| 81 | { PCI_VDEVICE(INTEL, 0x1D65),}, | 81 | { PCI_VDEVICE(INTEL, 0x1D65),}, |