Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[linux-2.6-block.git] / drivers / net / ethernet / mellanox / mlx4 / cmd.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 02a2e90d581a450fcf02f19b1924de14d0cb60ea..923c4878461e8a1c1242034b618473efba584060 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1695,7 +1695,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
                        if (err) {
                                vp_oper->vlan_idx = NO_INDX;
                                mlx4_warn(&priv->dev,
-                                         "No vlan resorces slave %d, port %d\n",
+                                         "No vlan resources slave %d, port %d\n",
                                          slave, port);
                                return err;
                        }
@@ -1711,7 +1711,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
                                err = vp_oper->mac_idx;
                                vp_oper->mac_idx = NO_INDX;
                                mlx4_warn(&priv->dev,
-                                         "No mac resorces slave %d, port %d\n",
+                                         "No mac resources slave %d, port %d\n",
                                          slave, port);
                                return err;
                        }