]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
OMAP2+: Fix random config build break with !ARM_CPU_SUSPEND
authorSantosh Shilimkar <santosh.shilimkar@ti.com>
Fri, 13 Jul 2012 10:45:07 +0000 (16:15 +0530)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Aug 2012 07:22:19 +0000 (00:22 -0700)
The random config builds with PM and !ARM_CPU_SUSPEND breaks with below
error on omap2plus_defconfig.

arch/arm/mach-omap2/sleep44xx.S:323: undefined reference to `cpu_resume'
arch/arm/mach-omap2/omap-mpuss-lowpower.c:278: undefined reference to `cpu_suspend'

This is because recently merged OMAP5 platform shares the common files
with OMAP4 but doesn't select ARM_CPU_SUSPEND. Without the ARM_CPU_SUSPEND
the sleep code is meaningless.

Fix the same by adding ARM_CPU_SUSPEND for OMAP5. The suggestion came from
Russell King in an off-list discussion.

Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Kevin Hilman <khilman@ti.com>
Reported-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/Kconfig

index dd2db025f7787e590d94bb229cb143559f9a8317..4a4d058ed146d39e50353ea7c7cea114660a7c91 100644 (file)
@@ -69,6 +69,7 @@ config SOC_OMAP5
        select CPU_V7
        select ARM_GIC
        select HAVE_SMP
+       select ARM_CPU_SUSPEND if PM
 
 comment "OMAP Core Type"
        depends on ARCH_OMAP2