diff options
| author | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-01-13 23:59:13 -0600 |
| commit | dcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch) | |
| tree | 5e79741f1865a3aef840e68d7db9e7ed4d685b5a /drivers/infiniband/hw/qib/qib_init.c | |
| parent | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (diff) | |
| parent | 7250170c9ed00f3b74b11b98afefab45020672dd (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_init.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c index 58b0f8ad4a29..cf0cd30adc8d 100644 --- a/drivers/infiniband/hw/qib/qib_init.c +++ b/drivers/infiniband/hw/qib/qib_init.c @@ -1015,7 +1015,7 @@ static int __devinit qib_init_one(struct pci_dev *, #define DRIVER_LOAD_MSG "QLogic " QIB_DRV_NAME " loaded: " #define PFX QIB_DRV_NAME ": " -static const struct pci_device_id qib_pci_tbl[] = { +static DEFINE_PCI_DEVICE_TABLE(qib_pci_tbl) = { { PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_QLOGIC_IB_6120) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7220) }, { PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_IB_7322) }, |