From 256388ac61b779f43ac9b0ee11f168c6ab946fea Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 8 Feb 2012 02:08:21 +0000 Subject: [PATCH] --- yaml --- r: 290053 b: refs/heads/master c: 8c1a7f5283e72306d1d23524f051501ffa1baf57 h: refs/heads/master i: 290051: b7fa5251822de4e403f9bd590d9fdcbc70e97b6d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2047f6dcf7a0..9b868992c1de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31a4c8b82788fa369c709bb3366c8b90c77c0dee +refs/heads/master: 8c1a7f5283e72306d1d23524f051501ffa1baf57 diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index c796de9eed72..6ce0706b2d1b 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -85,7 +85,7 @@ static int __devinit stmmac_pci_probe(struct pci_dev *pdev, continue; addr = pci_iomap(pdev, i, 0); if (addr == NULL) { - pr_err("%s: ERROR: cannot map regiser memory, aborting", + pr_err("%s: ERROR: cannot map register memory, aborting", __func__); ret = -EIO; goto err_out_map_failed;