From 379bb3edb46559c8c20698a05d9e2686ded19033 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Sun, 12 Feb 2012 03:45:41 +0000 Subject: [PATCH] --- yaml --- r: 290098 b: refs/heads/master c: 0f09a343dabeadc4dcde4714317e25de2e93fd13 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4523dc009f33..c8f421bb23c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4807f643872fce66108346d9e406c6df119bf395 +refs/heads/master: 0f09a343dabeadc4dcde4714317e25de2e93fd13 diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 6ce0706b2d1b..4e12884bab39 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -98,7 +98,7 @@ static int __devinit stmmac_pci_probe(struct pci_dev *pdev, priv = stmmac_dvr_probe(&(pdev->dev), &plat_dat); if (!priv) { - pr_err("%s: main drivr probe failed", __func__); + pr_err("%s: main driver probe failed", __func__); goto err_out; } priv->ioaddr = addr; diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 1ac83243649a..11af27ef4930 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -61,7 +61,7 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) plat_dat = pdev->dev.platform_data; priv = stmmac_dvr_probe(&(pdev->dev), plat_dat); if (!priv) { - pr_err("%s: main drivr probe failed", __func__); + pr_err("%s: main driver probe failed", __func__); goto out_unmap; }