Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[linux-2.6-omap-h63xx.git] / drivers / scsi / qla4xxx / ql4_mbx.c

diff --git a/drivers/scsi/qla4xxx/ql4_mbx.c b/drivers/scsi/qla4xxx/ql4_mbx.c
index c577d79bd7e8676faa222b6a1e1b9eaf7fc122a2..051b0f5e8c8e88cc53494ac9d1922af9e2150541 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_mbx.c
+++ b/drivers/scsi/qla4xxx/ql4_mbx.c
@@ -392,7 +392,7 @@ int qla4xxx_get_firmware_status(struct scsi_qla_host * ha)
                ha->iocb_hiwat -= IOCB_HIWAT_CUSHION;
        else
                dev_info(&ha->pdev->dev, "WARNING!!!  You have less than %d "
-                          "firmare IOCBs available (%d).\n",
+                          "firmware IOCBs available (%d).\n",
                           IOCB_HIWAT_CUSHION, ha->iocb_hiwat);
 
        return QLA_SUCCESS;