Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...

[linux-2.6] / drivers / infiniband / hw / ipath / ipath_driver.c

diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index ed7bdc93b9e379e6b71c34a8138438140a1cfb82..acf30c06a0c0ff8eb1981e692c7cc2818b78c4cc 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2007 QLogic Corporation. All rights reserved.
+ * Copyright (c) 2006, 2007, 2008 QLogic Corporation. All rights reserved.
  * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
  *
  * This software is available to you under a choice of one of two
@@ -538,7 +538,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
        case PCI_DEVICE_ID_INFINIPATH_7220:
 #ifndef CONFIG_PCI_MSI
                ipath_dbg("CONFIG_PCI_MSI is not enabled, "
-                         "using IntX for unit %u\n", dd->ipath_unit);
+                         "using INTx for unit %u\n", dd->ipath_unit);
 #endif
                ipath_init_iba7220_funcs(dd);
                break;