diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-09-23 03:38:39 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-09-23 03:38:39 +0400 |
| commit | 7a04c4cbf73953f1995a141534b7fe0c35828057 (patch) | |
| tree | 8b83a813600605510bd54cadb81f296d342e1b6b /arch/arm/mach-omap2/pm.c | |
| parent | f8cf8e47fb87e3b27e63d36fc8d61b11273f37bc (diff) | |
| parent | fbe01f51a8260c1f0a66e8730c4fd2c5160ecb91 (diff) | |
| download | linux-7a04c4cbf73953f1995a141534b7fe0c35828057.tar.xz | |
Merge branch 'for_3.2/omap_device' of git://gitorious.org/khilman/linux-omap-pm into cleanup
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 472bf22d5e84..e7cd794ae43a 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -60,19 +60,19 @@ EXPORT_SYMBOL(omap4_get_dsp_device); static int _init_omap_device(char *name, struct device **new_dev) { struct omap_hwmod *oh; - struct omap_device *od; + struct platform_device *pdev; oh = omap_hwmod_lookup(name); if (WARN(!oh, "%s: could not find omap_hwmod for %s\n", __func__, name)) return -ENODEV; - od = omap_device_build(oh->name, 0, oh, NULL, 0, pm_lats, 0, false); - if (WARN(IS_ERR(od), "%s: could not build omap_device for %s\n", + pdev = omap_device_build(oh->name, 0, oh, NULL, 0, pm_lats, 0, false); + if (WARN(IS_ERR(pdev), "%s: could not build omap_device for %s\n", __func__, name)) return -ENODEV; - *new_dev = &od->pdev.dev; + *new_dev = &pdev->dev; return 0; } |