diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/net/davinci_emac.c | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
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 1ac9440eb3fb..13f9869927e3 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
| @@ -2658,7 +2658,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev) | |||
| 2658 | 2658 | ||
| 2659 | pdata = pdev->dev.platform_data; | 2659 | pdata = pdev->dev.platform_data; |
| 2660 | if (!pdata) { | 2660 | if (!pdata) { |
| 2661 | printk(KERN_ERR "DaVinci EMAC: No platfrom data\n"); | 2661 | printk(KERN_ERR "DaVinci EMAC: No platform data\n"); |
| 2662 | return -ENODEV; | 2662 | return -ENODEV; |
| 2663 | } | 2663 | } |
| 2664 | 2664 | ||