diff options
| author | Roland Dreier <rolandd@cisco.com> | 2010-05-27 11:05:04 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2010-05-27 11:05:04 -0700 |
| commit | 767dcd42e51c69be88f83683eda7883e522618fa (patch) | |
| tree | 93e1c040b964fda6f5d8577ebe3fedd786a22df2 /drivers/infiniband/hw/qib/qib_init.c | |
| parent | e642df6a0be93316c0a886766057c4cc510c123d (diff) | |
| parent | 7145c45a06e9c918ccf2d8b27b01409a98a67be7 (diff) | |
| download | linux-767dcd42e51c69be88f83683eda7883e522618fa.tar.gz linux-767dcd42e51c69be88f83683eda7883e522618fa.tar.bz2 linux-767dcd42e51c69be88f83683eda7883e522618fa.zip | |
Merge branches 'misc' and 'qib' into for-next
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_init.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_init.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c index c0139c07e97e..9b40f345ac3f 100644 --- a/drivers/infiniband/hw/qib/qib_init.c +++ b/drivers/infiniband/hw/qib/qib_init.c @@ -1237,7 +1237,13 @@ static int __devinit qib_init_one(struct pci_dev *pdev, */ switch (ent->device) { case PCI_DEVICE_ID_QLOGIC_IB_6120: +#ifdef CONFIG_PCI_MSI dd = qib_init_iba6120_funcs(pdev, ent); +#else + qib_early_err(&pdev->dev, "QLogic PCIE device 0x%x cannot " + "work if CONFIG_PCI_MSI is not enabled\n", + ent->device); +#endif break; case PCI_DEVICE_ID_QLOGIC_IB_7220: |