From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 05:50:41 +0000 (+1100)
Subject: Merge remote-tracking branch 'hwspinlock/linux-next'
X-Git-Tag: next-20111012~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=20d6aed307758fe9d57bfa96a17258ca283657e4;p=karo-tx-linux.git

Merge remote-tracking branch 'hwspinlock/linux-next'

Conflicts:
	arch/arm/mach-omap2/hwspinlock.c
---

20d6aed307758fe9d57bfa96a17258ca283657e4
diff --cc arch/arm/mach-omap2/hwspinlock.c
index 0b3ae9d9c3b3,eb7e509957db..9c0de1d9eef2
--- a/arch/arm/mach-omap2/hwspinlock.c
+++ b/arch/arm/mach-omap2/hwspinlock.c
@@@ -48,13 -53,14 +53,14 @@@ int __init hwspinlocks_init(void
  	if (oh == NULL)
  		return -EINVAL;
  
- 	pdev = omap_device_build(dev_name, 0, oh, NULL, 0,
 -	od = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
++	pdev = omap_device_build(dev_name, 0, oh, &omap_hwspinlock_pdata,
+ 				sizeof(struct hwspinlock_pdata),
  				omap_spinlock_latency,
  				ARRAY_SIZE(omap_spinlock_latency), false);
 -	if (IS_ERR(od)) {
 +	if (IS_ERR(pdev)) {
  		pr_err("Can't build omap_device for %s:%s\n", dev_name,
  								oh_name);
 -		retval = PTR_ERR(od);
 +		retval = PTR_ERR(pdev);
  	}
  
  	return retval;