From 65d5dda5065e7aeeb6c8b0a5efe6727c8c95b62f Mon Sep 17 00:00:00 2001 From: Betty Dall Date: Thu, 19 Jul 2012 19:34:19 +0000 Subject: [PATCH] --- yaml --- r: 316387 b: refs/heads/master c: f3331f88a4b97530b7acd3112902524d9dc0688c h: refs/heads/master i: 316385: b854ae9c453fa8bfdbd6d4ed97392062eb88a13a 316383: 6feca0e589128a58fef0fa71cf0fb24922de1088 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/qib/qib_pcie.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0d8157e4e1a3..bcc97bdaa9b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fb9fed6d48960fec3ad8c97fed9aa16c9557091 +refs/heads/master: f3331f88a4b97530b7acd3112902524d9dc0688c diff --git a/trunk/drivers/infiniband/hw/qib/qib_pcie.c b/trunk/drivers/infiniband/hw/qib/qib_pcie.c index 790646ef5106..4f9d91823f15 100644 --- a/trunk/drivers/infiniband/hw/qib/qib_pcie.c +++ b/trunk/drivers/infiniband/hw/qib/qib_pcie.c @@ -725,7 +725,7 @@ qib_pci_mmio_enabled(struct pci_dev *pdev) static pci_ers_result_t qib_pci_slot_reset(struct pci_dev *pdev) { - qib_devinfo(pdev, "QIB link_reset function called, ignored\n"); + qib_devinfo(pdev, "QIB slot_reset function called, ignored\n"); return PCI_ERS_RESULT_CAN_RECOVER; }