diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2014-05-20 16:19:23 -0500 |
---|---|---|
committer | Nishanth Menon <nm@ti.com> | 2014-09-08 11:38:43 -0500 |
commit | 628ed4717000789bff827c5799d1aac4c1008541 (patch) | |
tree | 4e89f9e774a60746f0f6823137fc93da5e682456 /arch/arm/mach-omap2/common.h | |
parent | 6099dd37c66931085557363b4716483f97cf92a0 (diff) | |
download | op-kernel-dev-628ed4717000789bff827c5799d1aac4c1008541.zip op-kernel-dev-628ed4717000789bff827c5799d1aac4c1008541.tar.gz |
ARM: OMAP5: Add hook in SoC initcalls to enable pm initialization
With consolidated code, now we can add the required hooks for
OMAP5 to enable power management.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
[nm@ti.com: minor rebase updates]
Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Kevin Hilman <khilman@linaro.org>
Tested-by: Kevin Hilman <khilman@linaro.org>
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 dc571f1..5bb1592 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 |