Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / infiniband / hw / amso1100 / c2_qp.c

diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index d8f4bb8..0d7b6f2 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -612,7 +612,7 @@ void c2_free_qp(struct c2_dev *c2dev, struct c2_qp *qp)
        c2_unlock_cqs(send_cq, recv_cq);
 
        /*
-        * Destory qp in the rnic...
+        * Destroy qp in the rnic...
         */
        destroy_qp(c2dev, qp);