diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-09-08 15:20:15 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-09-08 15:20:15 -0700 |
| commit | 887782e04f8ada770e24cfb190d2ceed3b2c4974 (patch) | |
| tree | acb6a9ee8b1993d1ca15392897da60512a094dba /arch/arm/mach-omap2/common.h | |
| parent | d7eb67f7fef9c046f27a975118da2324de65a90c (diff) | |
| parent | 628ed4717000789bff827c5799d1aac4c1008541 (diff) | |
Merge branch 'pull/v3.18/for-omap-soc' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/soc
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index dc571f1d3b8a..5bb15920f73a 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -60,7 +60,7 @@ static inline int omap3_pm_init(void) } #endif -#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4) +#if defined(CONFIG_PM) && (defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)) int omap4_pm_init(void); int omap4_pm_init_early(void); #else |