diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-22 16:38:39 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-22 16:38:39 -0700 |
| commit | 7a04c4cbf73953f1995a141534b7fe0c35828057 (patch) | |
| tree | 8b83a813600605510bd54cadb81f296d342e1b6b /arch/arm/mach-omap2/hwspinlock.c | |
| parent | f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc (diff) | |
| parent | fbe01f51a8260c1f0a66e8730c4fd2c5160ecb91 (diff) | |
Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/hwspinlock.c')
| -rw-r--r-- | arch/arm/mach-omap2/hwspinlock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/hwspinlock.c b/arch/arm/mach-omap2/hwspinlock.c index 06d4a80660a..0b3ae9d9c3b 100644 --- a/arch/arm/mach-omap2/hwspinlock.c +++ b/arch/arm/mach-omap2/hwspinlock.c @@ -35,7 +35,7 @@ int __init hwspinlocks_init(void) { int retval = 0; struct omap_hwmod *oh; - struct omap_device *od; + struct platform_device *pdev; const char *oh_name = "spinlock"; const char *dev_name = "omap_hwspinlock"; @@ -48,13 +48,13 @@ int __init hwspinlocks_init(void) if (oh == NULL) return -EINVAL; - od = omap_device_build(dev_name, 0, oh, NULL, 0, + pdev = omap_device_build(dev_name, 0, oh, NULL, 0, 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; |