diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
| commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
| tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /drivers/net/davinci_emac.c | |
| parent | d14a0ebda7d3daede1a99c01527affb9ceaa4c22 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/davinci_emac.c')
| -rw-r--r-- | drivers/net/davinci_emac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 5c4f5b14ff02..2b8edd2efbf6 100644 --- 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) | |||
| 2665 | 2665 | ||
| 2666 | pdata = pdev->dev.platform_data; | 2666 | pdata = pdev->dev.platform_data; |
| 2667 | if (!pdata) { | 2667 | if (!pdata) { |
| 2668 | printk(KERN_ERR "DaVinci EMAC: No platfrom data\n"); | 2668 | printk(KERN_ERR "DaVinci EMAC: No platform data\n"); |
| 2669 | return -ENODEV; | 2669 | return -ENODEV; |
| 2670 | } | 2670 | } |
| 2671 | 2671 | ||