Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[linux-2.6-block.git] / drivers / net / davinci_emac.c

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 5c4f5b14ff026d4132699379663990f78703cda3..2b8edd2efbf608994946f1a1cb9ae40f71938ae7 100644 (file)
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2665,7 +2665,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
 
        pdata = pdev->dev.platform_data;
        if (!pdata) {
-               printk(KERN_ERR "DaVinci EMAC: No platfrom data\n");
+               printk(KERN_ERR "DaVinci EMAC: No platform data\n");
                return -ENODEV;
        }