From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 02:54:11 +0000 (+1000)
Subject: Merge remote-tracking branch 'crypto/master'
X-Git-Tag: next-20130619~64
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2c94970a9da0a038769cb4f7c6bcaec45715c03;p=karo-tx-linux.git

Merge remote-tracking branch 'crypto/master'
---

a2c94970a9da0a038769cb4f7c6bcaec45715c03
diff --cc drivers/char/hw_random/omap-rng.c
index d2903e772270,e5deb99feb28..6843ec87b98b
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@@ -116,9 -116,14 +116,9 @@@ static int omap_rng_probe(struct platfo
  	};
  
  	omap_rng_ops.priv = (unsigned long)priv;
- 	dev_set_drvdata(&pdev->dev, priv);
+ 	platform_set_drvdata(pdev, priv);
  
  	priv->mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -	if (!priv->mem_res) {
 -		ret = -ENOENT;
 -		goto err_ioremap;
 -	}
 -
  	priv->base = devm_ioremap_resource(&pdev->dev, priv->mem_res);
  	if (IS_ERR(priv->base)) {
  		ret = PTR_ERR(priv->base);