aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/sleep44xx.S
diff options
context:
space:
mode:
authorStefan Hengelein <stefan.hengelein@fau.de>2015-02-25 19:44:27 +0100
committerTony Lindgren <tony@atomide.com>2015-03-16 16:23:28 -0700
commit606da4826b89b044b51e3a84958b802204cfe4c7 (patch)
tree6c543eab0a07ba9842f8b8672416ed9805f7956f /arch/arm/mach-omap2/sleep44xx.S
parentMAINTAINERS: add OMAP defconfigs under OMAP SUPPORT (diff)
downloadlinux-dev-606da4826b89b044b51e3a84958b802204cfe4c7.tar.xz
linux-dev-606da4826b89b044b51e3a84958b802204cfe4c7.zip
ARM: OMAP4: remove dead kconfig option OMAP4_ERRATA_I688
The Kconfig-Option OMAP4_ERRATA_I688 is never visible due to a contradiction in it's dependencies. The option requires ARCH_MULTIPLATFORM to be 'disabled'. However, an enclosing menu requires either ARCH_MULTI_V6 or ARCH_MULTI_V7 to be enabled. These options inherit a dependency from an enclosing menu, that requires ARCH_MULTIPLATFORM to be 'enabled'. This is a contradiction and made this option also unavailable for non-multiplatform configurations. Since there are no selects on OMAP4_ERRATA_I688, which would ignore dependencies, the code related to that option is dead and can be removed. This (logical) defect has been found with the undertaker tool. (https://undertaker.cs.fau.de) Signed-off-by: Stefan Hengelein <stefan.hengelein@fau.de> Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/sleep44xx.S')
-rw-r--r--arch/arm/mach-omap2/sleep44xx.S2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
index b84a0122d823..ad1bb9431e94 100644
--- a/arch/arm/mach-omap2/sleep44xx.S
+++ b/arch/arm/mach-omap2/sleep44xx.S
@@ -333,11 +333,9 @@ ENDPROC(omap4_cpu_resume)
#endif /* defined(CONFIG_SMP) && defined(CONFIG_PM) */
-#ifndef CONFIG_OMAP4_ERRATA_I688
ENTRY(omap_bus_sync)
ret lr
ENDPROC(omap_bus_sync)
-#endif
ENTRY(omap_do_wfi)
stmfd sp!, {lr}