Merge remote-tracking branch 'regulator/fix/palmas' into tmp

[~andy/linux] / drivers / net / ethernet / qlogic / qlcnic / qlcnic_main.c

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 5d5fd06c4b428f3a134d1cb0c4eb80d0b58518eb..28a6d483836431f7d06fdb44c54fa3c854432449 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1150,7 +1150,7 @@ static int qlcnic_check_npar_opertional(struct qlcnic_adapter *adapter)
        }
        if (!npar_opt_timeo) {
                dev_err(&adapter->pdev->dev,
-                       "Waiting for NPAR state to opertional timeout\n");
+                       "Waiting for NPAR state to operational timeout\n");
                return -EIO;
        }
        return 0;