diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-28 16:15:06 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-28 16:15:06 -0800 |
| commit | 824e2dbb29eedb4afde9cb592a912f56038a5d1e (patch) | |
| tree | 16831eceadb66c7fc661e387f81fc65c93742c1e /arch/arm/mach-omap2/pm.c | |
| parent | e9d69010996539b07caef1c9fa9a481e1df95e68 (diff) | |
| parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) | |
Merge branch 'hsmmc' into fixes-non-critical
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 1881fe91514..fb9b85bfc30 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -28,7 +28,7 @@ static struct omap_device_pm_latency *pm_lats; -static int _init_omap_device(char *name) +static int __init _init_omap_device(char *name) { struct omap_hwmod *oh; struct platform_device *pdev; |