diff --git a/[refs] b/[refs] index b712fbf429e2..4a01699cebef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d058590976cb76defb636d78999cca353a09695b +refs/heads/master: 53c90536e96218ed6d60e7ea7a69a92b68805cdf diff --git a/trunk/drivers/net/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c index a63d2babdd8d..f47fbb63d8b6 100644 --- a/trunk/drivers/net/enic/enic_main.c +++ b/trunk/drivers/net/enic/enic_main.c @@ -2428,7 +2428,7 @@ static int enic_dev_init(struct enic *enic) err = enic_dev_set_ig_vlan_rewrite_mode(enic); if (err) { - netdev_err(netdev, + dev_err(dev, "Failed to set ingress vlan rewrite mode, aborting.\n"); goto err_out_free_vnic_resources; }