diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-19 15:30:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-19 15:30:25 -0400 |
| commit | d15b1de46ffa7551c36d7be5a58a02321a820a0f (patch) | |
| tree | a0fe3040612ba917bdfd64846e4abdc1a15bb263 /drivers/scsi/csiostor/csio_init.c | |
| parent | 970282d0e1404b23f9d7ec6a676fa76ff15b3376 (diff) | |
| parent | 768ffc66b45fd6551162d64ac8d92c101725262a (diff) | |
Merge branch 'cxgb4-next'
Hariprasad Shenai says:
====================
Add Device ID and make device ID table const
This patch series adds new device ID and makes device ID table const
The patches series is created against 'net-next' tree.
And includes patches on cxgb4 and csiostor driver.
We have included all the maintainers of respective drivers. Kindly review the
change and let us know in case of any review comments.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/csiostor/csio_init.c')
| -rw-r--r-- | drivers/scsi/csiostor/csio_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/csiostor/csio_init.c b/drivers/scsi/csiostor/csio_init.c index d9631e15f7b5..dbe416ff46c2 100644 --- a/drivers/scsi/csiostor/csio_init.c +++ b/drivers/scsi/csiostor/csio_init.c @@ -1172,7 +1172,7 @@ static struct pci_error_handlers csio_err_handler = { * Macros needed to support the PCI Device ID Table ... */ #define CH_PCI_DEVICE_ID_TABLE_DEFINE_BEGIN \ - static struct pci_device_id csio_pci_tbl[] = { + static const struct pci_device_id csio_pci_tbl[] = { /* Define for FCoE uses PF6 */ #define CH_PCI_DEVICE_ID_FUNCTION 0x6 |