summaryrefslogtreecommitdiffstats
path: root/drivers/net/sh_eth.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 18:12:14 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 18:12:14 +0200
commitfac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch)
tree1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /drivers/net/sh_eth.c
parentARM: s3c2440: gta02; Register dfbmcs320 device for BT audio interface (diff)
parentLinux 2.6.39-rc3 (diff)
downloadlinux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.tar.xz
linux-fac56c2df51bc29b07b3c2dcfabf32a015a0522c.zip
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'drivers/net/sh_eth.c')
-rw-r--r--drivers/net/sh_eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index e9e7a530552c..8a72a979ee71 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -1875,7 +1875,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
if (ret)
goto out_unregister;
- /* print device infomation */
+ /* print device information */
pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
(u32)ndev->base_addr, ndev->dev_addr, ndev->irq);